diff --git a/src/porchlight/manage/routes.py b/src/porchlight/manage/routes.py
index 7f15ca0..8399c8e 100644
--- a/src/porchlight/manage/routes.py
+++ b/src/porchlight/manage/routes.py
@@ -82,7 +82,7 @@ async def set_password(
         return HTMLResponse(format_validation_errors(exc))
 
     # Verify current password if changing
-    if has_password:
+    if has_password and isinstance(validated, PasswordChange):
         if not password_service.verify(existing.password_hash, validated.current_password):
             return HTMLResponse('<div role="alert">Current password is incorrect</div>')