diff --git a/zerver/forms.py b/zerver/forms.py
index 9c6db2f4f8..097d65d9e8 100644
--- a/zerver/forms.py
+++ b/zerver/forms.py
@@ -92,7 +92,7 @@ class OurAuthenticationForm(AuthenticationForm):
         try:
             user_profile = get_user_profile_by_email(email)
         except UserProfile.DoesNotExist:
-            return
+            return email
 
         if user_profile.realm.deactivated:
             error_msg = u"""Sorry for the trouble, but %s has been deactivated.