diff --git a/mandaye/auth/authform.py b/mandaye/auth/authform.py
index dde9205..5f615a7 100644
--- a/mandaye/auth/authform.py
+++ b/mandaye/auth/authform.py
@@ -321,14 +321,14 @@ a password_field key if you want to encode a password.")
         logger.debug('User %s successfully login' % env['beaker.session']['unique_id'])
 
         association = Association.get_last_connected(self.site_name, unique_id)
+        if not association and session.get('post_values'):
+            logger.info('Auto associate user which is already locally logged in')
+            self._save_association(env, unique_id, session['post_values'])
+            del session['post_values']
+            del session['is_associated']
+            session.save()
+            association = Association.get_last_connected(self.site_name, unique_id)
         if not association:
-            if session.get('post_values'):
-                logger.info('Auto associate user which is already locally logged in')
-                self._save_association(env, unique_id, session['post_values'])
-                del session['post_values']
-                del session['is_associated']
-                session.save()
-                return _302(self.urls['login_url'])
             logger.debug('User %s is not associate' % env['beaker.session']['unique_id'])
             return _302(self.urls.get('associate_url') + "?type=first")
         return self._login_sp_user(association, env, values)