diff --git a/seahub/auth/views.py b/seahub/auth/views.py
index c2d5c78b6f..5ab1f1499d 100644
--- a/seahub/auth/views.py
+++ b/seahub/auth/views.py
@@ -162,6 +162,7 @@ def login(request, template_name='registration/login.html',
                             user.freeze_user(notify_admins=True)
                     except User.DoesNotExist:
                         pass
+                    form.errors['freeze_account'] = _('This account has been frozen due to too many failed login attempts.')
             else:
                 # log user in if password is valid otherwise show captcha
                 form = CaptchaAuthenticationForm(data=request.POST)
diff --git a/seahub/templates/registration/login.html b/seahub/templates/registration/login.html
index be4b50e9ac..f2b560253d 100644
--- a/seahub/templates/registration/login.html
+++ b/seahub/templates/registration/login.html
@@ -20,9 +20,11 @@
     <input type="hidden" name="next" value="{% if next %}{{ next|escape }}{% else %}{{ SITE_ROOT }}{% endif %}" />
     {% if form.errors %}
       {% if form.captcha.errors %}
-	<p class="error">{{ form.captcha.errors}}</p>
+        <p class="error">{{ form.captcha.errors}}</p>
+      {% elif form.errors.freeze_account %}
+        <p class="error">{{ form.errors.freeze_account }}</p>
       {% else %}
-	<p class="error">{% trans "Incorrect email or password" %}</p>
+        <p class="error">{% trans "Incorrect email or password" %}</p>
       {% endif %}
     {% else %}
 	<p class="error hide"></p>