diff --git a/modoboa/auth/views.py b/modoboa/auth/views.py
index f2c9d7612..78f3e7284 100755
--- a/modoboa/auth/views.py
+++ b/modoboa/auth/views.py
@@ -23,7 +23,7 @@ def dologin(request):
                 if not form.cleaned_data["rememberme"]:
                     request.session.set_expiry(0)
                 login(request, user)
-                if request.user.id != 1:
+                if request.user.has_mailbox:
                     request.session["password"] = encrypt(form.cleaned_data["password"])
 
                 request.session["django_language"] = \