diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 82cec8da..53a63cd0 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -444,7 +444,7 @@ def change_email(request):
                 _('Sorry, a user with that email address'
                     ' already exists.'))
 
-        if user.pw_hash and not auth.check_password(
+        if form.password and user.pw_hash and not auth.check_password(
                 form.password.data, user.pw_hash):
             form.password.errors.append(
                 _('Wrong password'))