diff --git a/modoboa/userprefs/views.py b/modoboa/userprefs/views.py
index 907925d38..be70d1958 100644
--- a/modoboa/userprefs/views.py
+++ b/modoboa/userprefs/views.py
@@ -92,7 +92,7 @@ def profile(request, tplname='userprefs/profile.html'):
         )
         if form.is_valid():
             form.save()
-            if update_password:
+            if update_password and form.cleaned_data["confirmation"] != "":
                 request.session["password"] = encrypt(form.cleaned_data["confirmation"])
             return ajax_simple_response(dict(
                 status="ok", respmsg=_("Profile updated")