diff --git a/src/memory/params.py b/src/memory/params.py
index d4c88add..5cc303fd 100644
--- a/src/memory/params.py
+++ b/src/memory/params.py
@@ -879,6 +879,8 @@ class Params(object):
                 d.addCallback(lambda dummy: PasswordHasher.hash(value))  # profile password is hashed (empty value stays empty)
             elif value:  # other non empty passwords are encrypted with the personal key
                 d = BlockCipher.encrypt(personal_key, value)
+            else:
+                d = defer.succeed(value)
         else:
             d = defer.succeed(value)