diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index f6395bea3ca..2c0b8fc3d7a 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -8,6 +8,7 @@ message.launch.zone=Zone is ready to launch; please proceed to the next step.
 error.unable.to.reach.management.server=Unable to reach Management Server
 label.internal.name=Internal name
 label.max.networks=Max. networks
+error.invalid.username.password=Invalid username or password
 #new labels (end) ************************************************************************************************
 
 #modified labels (begin) *****************************************************************************************
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 279439090c1..6b33a628b83 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -7,6 +7,8 @@ label.network.service.providers=Network Service Providers
 message.launch.zone=Zone is ready to launch; please proceed to the next step.
 error.unable.to.reach.management.server=Unable to reach Management Server
 label.internal.name=Internal name
+label.max.networks=Max. networks
+error.invalid.username.password=Invalid username or password
 #new labels (end) ************************************************************************************************
 
 #modified labels (begin) *****************************************************************************************
diff --git a/ui/index.jsp b/ui/index.jsp
index d4aa46dfa18..7f7a79611ca 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -2875,6 +2875,7 @@ dictionary = {
 'label.purpose': '<fmt:message key="label.purpose" />',
 'error.please.specify.physical.network.tags': '<fmt:message key="error.please.specify.physical.network.tags" />',
 'error.unable.to.reach.management.server': '<fmt:message key="error.unable.to.reach.management.server" />',
-'label.internal.name': '<fmt:message key="label.internal.name" />'
+'label.internal.name': '<fmt:message key="label.internal.name" />',
+'error.invalid.username.password': '<fmt:message key="error.invalid.username.password" />'
 };
 </script>
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 7d3ebd069f7..80cda99b070 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -267,13 +267,11 @@
             window.g_projectsInviteRequired = false;
           },
           error: function(XMLHttpRequest) {					  
-						var errorMsg = parseXMLHttpResponse(XMLHttpRequest);	
-            if(errorMsg.length == 0) {		
-						  if(XMLHttpRequest.status == 0) 
-                errorMsg = dictionary['error.unable.to.reach.management.server'];	       
-              else
-							  errorMsg = dictionary['label.error'];	     
-            }								
+						var errorMsg = parseXMLHttpResponse(XMLHttpRequest);							
+            if(errorMsg.length == 0 && XMLHttpRequest.status == 0) 		
+						  errorMsg = dictionary['error.unable.to.reach.management.server'];	 
+            else 
+              errorMsg = _l('error.invalid.username.password'); //override error message             						
             args.response.error(errorMsg);			
           },										
 					beforeSend : function(XMLHttpResponse) {