diff --git a/config/alfresco/messages/system-messages.properties b/config/alfresco/messages/system-messages.properties
index 1c6b9452ee..12455373c7 100644
--- a/config/alfresco/messages/system-messages.properties
+++ b/config/alfresco/messages/system-messages.properties
@@ -75,12 +75,13 @@ system.usage.err.no_txn=RepoUsageComponent must be called in a transaction.
 system.usage.err.no_txn_readwrite=RepoUsageComponent must be called in a read-write transaction.
 
 # START TRANSLATION
-system.usage.warn.limit_users_approached=The allowable user limit of {0} is being approached.  There are {1} users in the system.
-system.usage.warn.limit_users_reached=The allowable user limit of {0} has been reached.  There are {1} users in the system.
-system.usage.warn.limit_documents_approached=The allowable content limit of {0} is being approached.  There are {1} content objects in the system.
+system.usage.warn.limit_users_approached=The allowable user limit of {0} as per your license agreement is being approached.  There are {1} users in the system. Please contact your Alfresco sales representative to purchase additional user licenses.
+system.usage.warn.limit_users_reached=The allowable user limit of {0} as per your license agreement has been reached.  There are {1} users in the system. Please contact your Alfresco sales representative to purchase additional user licenses.
+system.usage.warn.limit_documents_approached=The allowable content limit of {0} is being approached.  There are {1} content objects in the system. 
 system.usage.warn.limit_documents_reached=The allowable content limit of {0} has been reached.  There are {1} content objects in the system.
-system.usage.err.limit_users_exceeded=The allowable user limit of {0} has been exceeded.  There are currently {1} users in the system.
-system.usage.err.limit_users_exceeded_verbose=The allowable user limit of {0} has been exceeded. Users added: {1}
+system.usage.err.limit_users_exceeded=The allowable user limit of {0} as per your license agreement has been exceeded.  There are currently {1} users in the system. Please contact your Alfresco sales representative to purchase additional user licenses.
+system.usage.err.limit_users_exceeded_verbose=The allowable user limit of {0} as per your license agreement has been exceeded. Users added: {1}. Please contact your Alfresco sales representative to purchase additional user licenses.
+
 system.usage.err.limit_documents_exceeded=The allowable content limit of {0} has been exceeded.  There are currently {1} content objects in the system.
 system.usage.err.limit_license_expiring=The Alfresco license will expire in {0} days.
 system.usage.err.limit_license_expired=The Alfresco license has expired.
diff --git a/source/java/org/alfresco/repo/usage/RepoUsageComponentImpl.java b/source/java/org/alfresco/repo/usage/RepoUsageComponentImpl.java
index 1b2a2156a9..5526a88354 100644
--- a/source/java/org/alfresco/repo/usage/RepoUsageComponentImpl.java
+++ b/source/java/org/alfresco/repo/usage/RepoUsageComponentImpl.java
@@ -462,7 +462,8 @@ public class RepoUsageComponentImpl implements RepoUsageComponent
         if (usersCurrent > usersMax)
         {
             errors.add(I18NUtil.getMessage("system.usage.err.limit_users_exceeded", usersMax, usersCurrent));
-            level = RepoUsageLevel.LOCKED_DOWN;
+            // MNT-12712 changed this from LOCKED DOWN
+            level = RepoUsageLevel.WARN_ALL;
         }
         else if (usersCurrent == usersMax)
         {