diff --git a/api/chalicelib/core/users.py b/api/chalicelib/core/users.py
index d1b2abef6..a87a6023f 100644
--- a/api/chalicelib/core/users.py
+++ b/api/chalicelib/core/users.py
@@ -435,7 +435,7 @@ def set_password_invitation(user_id, new_password):
                "invitationToken": None, "invitedAt": None,
                "changePwdExpireAt": None, "changePwdToken": None}
     user = update(tenant_id=-1, user_id=user_id, changes=changes)
-    r = authenticate(user['email'], user['password'])
+    r = authenticate(user['email'], new_password)
     tenant_id = r.pop("tenantId")
 
     r["limits"] = {
diff --git a/ee/api/chalicelib/core/users.py b/ee/api/chalicelib/core/users.py
index 3d8b1750c..4c6032fc2 100644
--- a/ee/api/chalicelib/core/users.py
+++ b/ee/api/chalicelib/core/users.py
@@ -445,7 +445,7 @@ def set_password_invitation(user_id, new_password):
                "invitationToken": None, "invitedAt": None,
                "changePwdExpireAt": None, "changePwdToken": None}
     user = update(tenant_id=-1, user_id=user_id, changes=changes)
-    r = authenticate(user['email'], user['password'])
+    r = authenticate(user['email'], new_password)
 
     tenant_id = r.pop("tenantId")
     r["limits"] = {