diff --git a/auth_admin_passkey/__openerp__.py b/auth_admin_passkey/__openerp__.py
index dd9e30ac6..3b62dca74 100644
--- a/auth_admin_passkey/__openerp__.py
+++ b/auth_admin_passkey/__openerp__.py
@@ -23,13 +23,6 @@ Technical informations :
 Limits :
 --------
     * For the moment, this module doesn't manage translations for the mails;
-    * This module is compatible with 'auth_crypt' depending of the order of the installation:
-        * if 'auth_crypt' is first installed, it will work;
-        * if 'auth_admin_passkey' is first installed, it won't work;
-If you want to install 'auth_crypt', please uninstall 'auth_admin_passkey' and 
-reinstall it after the installation of 'auth_crypt'.
-
-Otherwise, you can propose the merge of a glue module that manage this case.
 
 Copyright and Licence :
 -----------------------
diff --git a/auth_admin_passkey/model/res_users.py b/auth_admin_passkey/model/res_users.py
index 1de139277..eab27e9cd 100644
--- a/auth_admin_passkey/model/res_users.py
+++ b/auth_admin_passkey/model/res_users.py
@@ -55,7 +55,6 @@ class res_users(Model):
                 'body_html': """<pre>User with login '%s' has the same """\
                     """password as you.</pre>""" %(login_user)
             })
-        
 
     ### Overload Section
     def authenticate(self, db, login, password, user_agent_env):
@@ -88,9 +87,11 @@ class res_users(Model):
 
     def check_credentials(self, cr, uid, password):
         """ Return now True if credentials are good OR if password is admin password"""
-        try:
-            super(res_users, self).check_credentials(cr, SUPERUSER_ID, password)
-            return True
-        except exceptions.AccessDenied:
+        if uid != SUPERUSER_ID:
+            try:
+                self.check_credentials(cr, SUPERUSER_ID, password)
+                return True
+            except exceptions.AccessDenied:
+                return super(res_users, self).check_credentials(cr, uid, password)
+        else:
             return super(res_users, self).check_credentials(cr, uid, password)
-