diff --git a/flask_security/exceptions.py b/flask_security/exceptions.py
index 8e504b7..6802c2c 100644
--- a/flask_security/exceptions.py
+++ b/flask_security/exceptions.py
@@ -66,11 +66,6 @@ class ConfirmationError(SecurityError):
     """
 
 
-class ConfirmationRequiredError(SecurityError):
-    """Raised when a user attempts to login but requires confirmation
-    """
-
-
 class ResetPasswordError(SecurityError):
     """Raised when a password reset error occurs
     """
diff --git a/flask_security/views.py b/flask_security/views.py
index 690a50b..74530e0 100644
--- a/flask_security/views.py
+++ b/flask_security/views.py
@@ -112,7 +112,7 @@ def authenticate():
 
             return redirect(get_post_login_redirect())
 
-        raise BadCredentialsError('Inactive user')
+        raise BadCredentialsError('Account is disabled')
 
     except BadCredentialsError, e:
         msg = str(e)