diff --git a/modoboa/core/views/auth.py b/modoboa/core/views/auth.py
index 9b6fb0198..e85b68655 100644
--- a/modoboa/core/views/auth.py
+++ b/modoboa/core/views/auth.py
@@ -57,7 +57,11 @@ class LoginViewMixin:
             return None
 
     def login(self, user, rememberme):
+        encrypted_password = self.request.session.pop("password", None)
         login(self.request, user)
+        # FIXME: remove ASAP
+        if encrypted_password:
+            self.request.session["password"] = encrypted_password
         if not rememberme:
             self.request.session.set_expiry(0)