diff --git a/lib/tapatalker.rb b/lib/tapatalker.rb
index 0a20c36..ce2903a 100644
--- a/lib/tapatalker.rb
+++ b/lib/tapatalker.rb
@@ -285,9 +285,9 @@ helpers do
       return respond_xmlrpc( 'result' => false )
     end
     
-    # We can just proxy the entire cookie over untouched
-    headers "Set-Cookie" => discourse.last_response['Set-Cookie']
-    
+    set_cookies = discourse.cookies.each.collect {|c| c.set_cookie_value }
+    headers( "Set-Cookie" => set_cookies ) if set_cookies.size > 0
+
     # user = user_info.fetch("user")
     
     respond_xmlrpc(
@@ -372,6 +372,7 @@ helpers do
   # FIXME: STUB.
   # In API level 4, we can say this doesn't exist and force tapatalk to use get_topic
   def xmlrpc_get_unread_topic( start_num = 0, last_num = 0, search_id = nil, filters = nil )
+
     result = { 'result' => true }
 
     unread_topics = discourse.topics_unread({})
@@ -384,8 +385,10 @@ helpers do
     result['total_topic_num'] = result['topics'].count # api level 4
     
     respond_xmlrpc( result )
+
+    xmlrpc_get_latest_topic( start_num, last_num, search_id, filters )
   end
-  
+ 
   def xmlrpc_get_latest_topic( start_num = 0, last_num = 0, search_id = nil, filters = nil )
 
     result = { 'result' => true }
@@ -458,7 +461,7 @@ helpers do
   
  # def xmlrpc_get_id_by_url( url ) # TODO
  # end
-  
+ 
   def xmlrpc_get_thread( topic_id, start_num = 0, end_num = 0, return_html = false )
 
     topic_info = discourse.topic(:topic_id => topic_id.to_i)
@@ -509,6 +512,7 @@ helpers do
     respond_xmlrpc( result )
   end
   
+  
  # def get_smilies # TODO - not a priority
  # end