Index: fb_user.module
===================================================================
--- fb_user.module	(revision 2957)
+++ fb_user.module	(working copy)
@@ -138,8 +138,8 @@
       fb_controls(FB_USER_CONTROL_NO_CREATE_MAP, TRUE);
       fb_controls(FB_USER_CONTROL_NO_CREATE_ACCOUNT, TRUE);
     }
-    if (isset($_REQUEST['_fb_js_fbu'])) {
-      // fb.js has triggered a reload.  Don't redirect again, as that will
+    if (isset($_REQUEST['_fb_user_fbu'])) {
+      // We've triggered a reload.  Don't redirect again, as that will
       // cause infinite loop if browser not accepting third-party cookies.
       fb_controls(FB_USER_CONTROL_NO_REDIRECT, TRUE);
     }
@@ -186,7 +186,7 @@
         // There's no need to honor maps in ajax callback.  If honored,
         // could lead to new session start which would not actually have any
         // effect in ajax callback.
-        fb_controls(FB_USER_CONTROL_NO_HONOR_MAP, TRUE);
+        //fb_controls(FB_USER_CONTROL_NO_HONOR_MAP, TRUE);
         _fb_user_process_authorized_user();
       }
     }
@@ -204,7 +204,8 @@
     if ($uid != $GLOBALS['user']->uid) {
       // during user processing, we started a new session.
       if (!fb_controls(FB_USER_CONTROL_NO_REDIRECT)) {
-        drupal_goto($_GET['q']); // @TODO - need request params here?
+        // Pass _fb_user_fbu to avoid infinite refreshes.
+        drupal_goto($_GET['q'], array('_fb_user_fbu' => $fbu));
       }
     }
   }