diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 18e12e46170..ede9a57ac62 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -432,6 +432,13 @@ label.action.enable.account.processing=Enabling account....
 label.action.delete.account=Delete account
 label.action.delete.account.processing=Deleting account....
 label.action.edit.user=Edit User
+label.action.change.password=Change Password
+label.action.generate.keys=Generate Keys
+label.action.generate.keys.processing=Generate Keys....
+label.action.disable.user=Disable User
+label.action.disable.user.processing=Disabling User....
+
+
 
 #Messages
 message.edit.limits=Please specify limits to the following resources.  A "-1" indicates no limit to the amount of resources create.
diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp
index cb5c6421f82..1dcc8fa3228 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -7,21 +7,26 @@
 
 <script language="javascript">
 dictionary = { 
-	"message.disable.account" : '<fmt:message key="message.disable.account"/>',
-	"message.lock.account" : '<fmt:message key="message.lock.account"/>',
-	"message.enable.account" : '<fmt:message key="message.enable.account"/>',
-	"message.delete.account" : '<fmt:message key="message.delete.account"/>',
-	"label.action.edit.account" : '<fmt:message key="label.action.edit.account"/>',
-	"label.action.resource.limits": '<fmt:message key="label.action.resource.limits"/>',
-	"label.action.disable.account": '<fmt:message key="label.action.disable.account"/>',
-	"label.action.disable.account.processing": '<fmt:message key="label.action.disable.account.processing"/>',
-	"label.action.lock.account": '<fmt:message key="label.action.lock.account"/>',
-	"label.action.lock.account.processing": '<fmt:message key="label.action.lock.account.processing"/>',
-	"label.action.enable.account": '<fmt:message key="label.action.enable.account"/>',
-	"label.action.enable.account.processing": '<fmt:message key="label.action.enable.account.processing"/>',
-	"label.action.delete.account": '<fmt:message key="label.action.delete.account"/>',
-	"label.action.delete.account.processing": '<fmt:message key="label.action.delete.account.processing"/>',
-	"label.action.edit.user": '<fmt:message key="label.action.edit.user"/>'
+	'message.disable.account' : '<fmt:message key="message.disable.account"/>',
+	'message.lock.account' : '<fmt:message key="message.lock.account"/>',
+	'message.enable.account' : '<fmt:message key="message.enable.account"/>',
+	'message.delete.account' : '<fmt:message key="message.delete.account"/>',
+	'label.action.edit.account' : '<fmt:message key="label.action.edit.account"/>',
+	'label.action.resource.limits': '<fmt:message key="label.action.resource.limits"/>',
+	'label.action.disable.account': '<fmt:message key="label.action.disable.account"/>',
+	'label.action.disable.account.processing': '<fmt:message key="label.action.disable.account.processing"/>',
+	'label.action.lock.account': '<fmt:message key="label.action.lock.account"/>',
+	'label.action.lock.account.processing': '<fmt:message key="label.action.lock.account.processing"/>',
+	'label.action.enable.account': '<fmt:message key="label.action.enable.account"/>',
+	'label.action.enable.account.processing': '<fmt:message key="label.action.enable.account.processing"/>',
+	'label.action.delete.account': '<fmt:message key="label.action.delete.account"/>',
+	'label.action.delete.account.processing': '<fmt:message key="label.action.delete.account.processing"/>',
+	'label.action.edit.user': '<fmt:message key="label.action.edit.user"/>',
+	'label.action.change.password': '<fmt:message key="label.action.change.password"/>',
+	'label.action.generate.keys': '<fmt:message key="label.action.generate.keys"/>',
+	'label.action.generate.keys.processing': '<fmt:message key="label.action.generate.keys.processing"/>',
+	'label.action.disable.user': '<fmt:message key="label.action.disable.user"/>',
+	'label.action.disable.user.processing': '<fmt:message key="label.action.disable.user.processing"/>'
 };	
 </script>
 
diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index 2b4414170eb..56c573bf33f 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -514,13 +514,13 @@ function accountUserJSONToTemplate(jsonObj, $template) {
     
     if(isAdmin()) {
         buildActionLinkForSubgridItem("label.action.edit.user", accountUserActionMap, $actionMenu, $template);	 
-        buildActionLinkForSubgridItem("Change Password", accountUserActionMap, $actionMenu, $template);	  
-        buildActionLinkForSubgridItem("Generate Keys", accountUserActionMap, $actionMenu, $template);	    
+        buildActionLinkForSubgridItem("label.action.change.password", accountUserActionMap, $actionMenu, $template);	  
+        buildActionLinkForSubgridItem("label.action.generate.keys", accountUserActionMap, $actionMenu, $template);	    
         noAvailableActions = false;
         
         if(jsonObj.id != systemUserId && jsonObj.id != adminUserId) {
             if(jsonObj.state == "enabled") 
-                buildActionLinkForSubgridItem("Disable User", accountUserActionMap, $actionMenu, $template);	  
+                buildActionLinkForSubgridItem("label.action.disable.user", accountUserActionMap, $actionMenu, $template);	  
             if(jsonObj.state == "disabled")
                 buildActionLinkForSubgridItem("Enable User", accountUserActionMap, $actionMenu, $template);	  
             buildActionLinkForSubgridItem("Delete User", accountUserActionMap, $actionMenu, $template);	  
@@ -800,24 +800,24 @@ var accountUserActionMap = {
     "label.action.edit.user": {
         dialogBeforeActionFn : doEditUser
     },
-    "Change Password": {
+    "label.action.change.password": {
         dialogBeforeActionFn : doChangePassword
     },
-    "Generate Keys": {  
+    "label.action.generate.keys": {  
         api: "registerUserKeys",            
         isAsyncJob: false,
-        inProcessText: "Generate Keys....",
+        inProcessText: "label.action.generate.keys.processing",
         afterActionSeccessFn: function(json, id, $subgridItem) {
             var jsonObj = json.registeruserkeysresponse.userkeys;
             $subgridItem.find("#apikey").text(fromdb(jsonObj.apikey));    
             $subgridItem.find("#secretkey").text(fromdb(jsonObj.secretkey));	
         }            
     },
-    "Disable User": {              
+    "label.action.disable.user": {              
         api: "disableUser",     
         isAsyncJob: true,
         asyncJobResponse: "disableuserresponse",		
-        inProcessText: "Disabling User....",
+        inProcessText: "label.action.disable.user.processing",
         afterActionSeccessFn: function(json, id, $subgridItem) {                 
             var item = json.queryasyncjobresultresponse.jobresult.user;    
             accountUserJSONToTemplate(item, $subgridItem);