diff --git a/data/model/legacy.py b/data/model/legacy.py
index 0ac383bed..311d566ad 100644
--- a/data/model/legacy.py
+++ b/data/model/legacy.py
@@ -905,6 +905,7 @@ def change_password(user, new_password):
     raise InvalidPasswordException(INVALID_PASSWORD_MESSAGE)
 
   pw_hash = hash_password(new_password)
+  user.invalid_login_attempts = 0
   user.password_hash = pw_hash
   user.save()