diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 806c2c50447..53c9b52f91a 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -427,6 +427,8 @@ 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....
+label.action.enable.account=Enable account
+label.action.enable.account.processing=Enabling 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 3b2a0edb8d6..1dcd5fb3092 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -16,7 +16,9 @@ var dictionary = {
 	"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.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"/>'
 };	
 </script>
 
diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index 252aec8433a..e73d9e390e2 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -403,7 +403,7 @@ function accountJsonToDetailsTab() {
                 buildActionLinkForTab("label.action.lock.account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);                
             }          	        
             else if(jsonObj.state == "disabled" || jsonObj.state == "locked") {
-                buildActionLinkForTab("Enable account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);                   
+                buildActionLinkForTab("label.action.enable.account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);                   
             }   
             
             buildActionLinkForTab("Delete account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);  
@@ -562,10 +562,10 @@ var accountActionMap = {
         }
     }    
     ,
-    "Enable account": {              
+    "label.action.enable.account": {              
         isAsyncJob: false,       
         dialogBeforeActionFn : doEnableAccount,
-        inProcessText: "Enabling account....",
+        inProcessText: "label.action.enable.account.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {   
             var item = json.enableaccountresponse.account;                  
             accountToMidmenu(item, $midmenuItem1);    
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 3255c21bdc2..70d13b109a4 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -74,10 +74,7 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
     var afterActionSeccessFn = apiInfo.afterActionSeccessFn;	    
             
     var $spinningWheel = $thisTab.find("#spinning_wheel");
-    if(inProcessText in dictionary)
-        $spinningWheel.find("#description").text(dictionary[inProcessText]);   
-    else
-        $spinningWheel.find("#description").text(label);       
+    $spinningWheel.find("#description").text(inProcessText2);       
     $spinningWheel.show();  
         
     $midmenuItem1.find("#content").removeClass("selected").addClass("inaction");                          
@@ -127,7 +124,7 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
 	                        error: function(XMLHttpResponse) {	                            
 		                        $("body").stopTime(timerKey);	
 								handleError(XMLHttpResponse, function() {
-									handleErrorInDetailsTab(XMLHttpResponse, $thisTab, label, $afterActionInfoContainer, $midmenuItem1); 		
+									handleErrorInDetailsTab(XMLHttpResponse, $thisTab, label2, $afterActionInfoContainer, $midmenuItem1); 		
 								});
 	                        }
                         });
@@ -137,7 +134,7 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
             },
             error: function(XMLHttpResponse) {
 				handleError(XMLHttpResponse, function() {
-					handleErrorInDetailsTab(XMLHttpResponse, $thisTab, label, $afterActionInfoContainer, $midmenuItem1); 
+					handleErrorInDetailsTab(XMLHttpResponse, $thisTab, label2, $afterActionInfoContainer, $midmenuItem1); 
 				});
             }
         });     
@@ -153,11 +150,11 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
 	        success: function(json) {	 	                  
 	            $spinningWheel.hide(); 	 
 	            afterActionSeccessFn(json, $midmenuItem1, id); //afterActionSeccessFn() will update $midmenuItem1.data("jsonObj")   
-	            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label + " action succeeded.")); //handleMidMenuItemAfterDetailsTabAction() will used updated $midmenuItem1.data("jsonObj")
+	            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label2 + " action succeeded.")); //handleMidMenuItemAfterDetailsTabAction() will used updated $midmenuItem1.data("jsonObj")
 	        },
             error: function(XMLHttpResponse) {
 				handleError(XMLHttpResponse, function() {
-					handleErrorInDetailsTab(XMLHttpResponse, $thisTab, label, $afterActionInfoContainer, $midmenuItem1); 
+					handleErrorInDetailsTab(XMLHttpResponse, $thisTab, label2, $afterActionInfoContainer, $midmenuItem1); 
 				});
             }        
         });