diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index a983c31853..67a5e01457 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -1728,6 +1728,8 @@ error_checkin=Unable to check in Content Node due to system error:
 error_paste=Unable to paste item due to system error:
 error_login_user=Unable to login - unknown username/password.
 error_login_missing=Must specify username and password.
+error_login_disallowed=Username disallowed - please try again later and/or contact your system administrator.
+error_login_maxusers=Maximum users exceeded - please try again later and/or contact your system administrator.
 error_delete_rule=Unable to delete Rule due to system error:
 error_actions=Failed to run Actions due to error: {0}
 error_rule=Failed to create Rule due to error: {0}
diff --git a/source/java/org/alfresco/web/bean/LoginBean.java b/source/java/org/alfresco/web/bean/LoginBean.java
index 62724d524e..bd75e33e39 100644
--- a/source/java/org/alfresco/web/bean/LoginBean.java
+++ b/source/java/org/alfresco/web/bean/LoginBean.java
@@ -35,7 +35,9 @@ import javax.faces.validator.ValidatorException;
 import javax.servlet.http.HttpServletRequest;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationDisallowedException;
 import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationMaxUsersException;
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -313,6 +315,14 @@ public class LoginBean
                }
             }
          }
+         catch (AuthenticationDisallowedException aerr)
+         {
+        	 Utils.addErrorMessage(Application.getMessage(fc, MSG_ERROR_LOGIN_DISALLOWED));
+         }  
+         catch (AuthenticationMaxUsersException aerr)
+         {
+        	 Utils.addErrorMessage(Application.getMessage(fc, MSG_ERROR_LOGIN_MAXUSERS));
+         }           
          catch (AuthenticationException aerr)
          {
             Utils.addErrorMessage(Application.getMessage(fc, MSG_ERROR_UNKNOWN_USER));
@@ -392,6 +402,8 @@ public class LoginBean
    /** I18N messages */
    private static final String MSG_ERROR_MISSING = "error_login_missing";
    private static final String MSG_ERROR_UNKNOWN_USER = "error_login_user";
+   private static final String MSG_ERROR_LOGIN_DISALLOWED = "error_login_disallowed";
+   private static final String MSG_ERROR_LOGIN_MAXUSERS = "error_login_maxusers";
    private static final String MSG_USERNAME_CHARS = "login_err_username_chars";
    private static final String MSG_USERNAME_LENGTH = "login_err_username_length";
    private static final String MSG_PASSWORD_CHARS = "login_err_password_chars";