diff --git a/api/chalicelib/core/users.py b/api/chalicelib/core/users.py
index caf6a9ade..e3134e6e3 100644
--- a/api/chalicelib/core/users.py
+++ b/api/chalicelib/core/users.py
@@ -449,9 +449,7 @@ def change_password(tenant_id, user_id, email, old_password, new_password):
 
 
 def set_password_invitation(user_id, new_password):
-    changes = {"password": new_password,
-               "invitationToken": None, "invitedAt": None,
-               "changePwdExpireAt": None, "changePwdToken": None}
+    changes = {"password": new_password}
     user = update(tenant_id=-1, user_id=user_id, changes=changes)
     r = authenticate(user['email'], new_password)
 
diff --git a/ee/api/chalicelib/core/users.py b/ee/api/chalicelib/core/users.py
index ff307d472..abff8433d 100644
--- a/ee/api/chalicelib/core/users.py
+++ b/ee/api/chalicelib/core/users.py
@@ -528,9 +528,7 @@ def change_password(tenant_id, user_id, email, old_password, new_password):
 
 
 def set_password_invitation(tenant_id, user_id, new_password):
-    changes = {"password": new_password,
-               "invitationToken": None, "invitedAt": None,
-               "changePwdExpireAt": None, "changePwdToken": None}
+    changes = {"password": new_password}
     user = update(tenant_id=tenant_id, user_id=user_id, changes=changes)
     r = authenticate(user['email'], new_password)