diff --git a/views/login/__init__.py b/views/login/__init__.py
index f380488dc2afc91f0d93e21977d3b301223bad49..c3a1e93354d9ebf3e1bdd00a89642680859596cc 100644
--- a/views/login/__init__.py
+++ b/views/login/__init__.py
@@ -808,7 +808,7 @@ def password_reset_stage2( user_id ):
         userid = data.get( "user_id", None )
         
         if password != None:
-            password = utils.hash.pbkdf2( password, utils.rand.random_data( config.EMAIL_SALT_LENGTH ), config.EMAIL_NB_ITERATIONS ).hash()
+            password = utils.hash.pbkdf2( password, utils.rand.random_data( config.PASSWORD_SALT_LENGTH ), config.PASSWORD_NB_ITERATIONS ).hash()
             config.db.query( "UPDATE users SET password = %s WHERE id = %s", ( password, userid ) )
             config.db.commit()
             
diff --git a/views/newuser/__init__.py b/views/newuser/__init__.py
index 2d762ca46eb5bb28d7e91f3733957238ab481f35..5f28b7247e7a542a288244602cd51de813a94584 100644
--- a/views/newuser/__init__.py
+++ b/views/newuser/__init__.py
@@ -398,7 +398,7 @@ def do_config_new_user():
     
     current_app.logger.debug( "Storing the new password to the databse" )
     
-    password = utils.hash.pbkdf2( password, utils.rand.random_data( config.EMAIL_SALT_LENGTH ), config.PASSWORD_NB_ITERATIONS ).hash()
+    password = utils.hash.pbkdf2( password, utils.rand.random_data( config.PASSWORD_SALT_LENGTH ), config.PASSWORD_NB_ITERATIONS ).hash()
     
     config.db.query( "UPDATE users SET password = %s WHERE username = %s", ( password, username, ) )
     config.db.commit()