diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 1cc76106ed4..806c2c50447 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -425,6 +425,8 @@ label.action.edit.account=Edit account
 label.action.resource.limits=Resource limits
 label.action.disable.account=Disable account
 label.action.disable.account.processing=Disabling account....
+label.action.lock.account=Lock account
+label.action.lock.account.processing=Locking account....
 
 #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 12a8bb86bdd..3b2a0edb8d6 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -14,7 +14,9 @@ var dictionary = {
 	"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.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"/>'
 };	
 </script>
 
diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index 0685aa00320..252aec8433a 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -400,7 +400,7 @@ function accountJsonToDetailsTab() {
              
             if(jsonObj.state == "enabled") {
                 buildActionLinkForTab("label.action.disable.account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);  
-                buildActionLinkForTab("Lock account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);                
+                buildActionLinkForTab("label.action.lock.account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);                
             }          	        
             else if(jsonObj.state == "disabled" || jsonObj.state == "locked") {
                 buildActionLinkForTab("Enable account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);                   
@@ -551,11 +551,11 @@ var accountActionMap = {
         }
     }    
     ,
-    "Lock account": {              
+    "label.action.lock.account": {              
         isAsyncJob: true,     
         asyncJobResponse: "disableaccountresponse",  
         dialogBeforeActionFn : doLockAccount,
-        inProcessText: "Locking account....",
+        inProcessText: "label.action.lock.account.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {  
             var item = json.queryasyncjobresultresponse.jobresult.account;
             accountToMidmenu(item, $midmenuItem1);   
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 5106b06e4c4..3255c21bdc2 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -24,10 +24,12 @@ function buildActionLinkForTab(label, actionMap, $actionMenu, $midmenuItem1, $th
     var $listItem = $("#action_list_item").clone();
     $actionMenu.find("#action_list").append($listItem.show());
   
+    var label2;
     if(label in dictionary)
-        $listItem.find("#link").text(dictionary[label]);   
+        label2 = dictionary[label];
     else
-        $listItem.find("#link").text(label);   
+        label2 = label;    
+    $listItem.find("#link").text(label2);   
         
     $listItem.data("label", label);	  
     $listItem.data("apiInfo", apiInfo);	 
@@ -52,9 +54,21 @@ function buildActionLinkForTab(label, actionMap, $actionMenu, $midmenuItem1, $th
 
 function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {  
     var label = $actionLink.data("label");	
+    var label2;
+    if(label in dictionary)
+        label2 = dictionary[label];
+    else
+        label2 = label;    
+        
     var apiInfo = $actionLink.data("apiInfo");	
     
-    var inProcessText = apiInfo.inProcessText;		           
+    var inProcessText = apiInfo.inProcessText;	
+    var inProcessText2;
+    if(inProcessText in dictionary)
+        inProcessText2 = dictionary[inProcessText];   
+    else
+        inProcessText2 = inProcessText;    
+    	           
     var isAsyncJob = apiInfo.isAsyncJob;
     var asyncJobResponse = apiInfo.asyncJobResponse;	
     var afterActionSeccessFn = apiInfo.afterActionSeccessFn;	    
@@ -68,7 +82,7 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
         
     $midmenuItem1.find("#content").removeClass("selected").addClass("inaction");                          
     $midmenuItem1.find("#spinning_wheel").addClass("midmenu_addingloader").show();	
-    $midmenuItem1.find("#spinning_wheel").data("inProcessText", inProcessText);
+    $midmenuItem1.find("#spinning_wheel").data("inProcessText", inProcessText2);
     $midmenuItem1.find("#info_icon").hide();		
     
     var $afterActionInfoContainer = $("#right_panel_content #after_action_info_container_on_top");   
@@ -102,11 +116,11 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
                                         
                                         //handleMidMenuItemAfterDetailsTabAction() will used updated $midmenuItem1.data("jsonObj")
                                         if(afterActionInfo == null)
-                                            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label + " action succeeded.")); 
+                                            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label2 + " action succeeded.")); 
                                         else
                                             handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, afterActionInfo); 
 			                        } else if (result.jobstatus == 2) { // Failed	
-			                            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, false, (label + " action failed. Reason: " + fromdb(result.jobresult.errortext)));			                            
+			                            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, false, (label2 + " action failed. Reason: " + fromdb(result.jobresult.errortext)));			                            
 			                        }											                    
 		                        }
 	                        },