diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 393308f2df4..0e54ac6a63e 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -421,6 +421,8 @@ label.vm.stop=Stop VM
 label.vm.reboot=Reboot VM
 label.vm.destroy=Destroy VM
 
+label.action.edit.account=Edit account
+
 #Messages
 message.edit.limits=Please specify limits to the following resources.  A "-1" indicates no limit to the amount of resources create.
 message.disable.account=Please confirm you want to disable this account.  By disabling the account, all users for this account will no longer have access to their cloud resources.  All running virtual machines will be immediately shut down. 
diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp
index e89927bf5b9..388c87cd453 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -11,6 +11,7 @@ var dictionary = {
 	"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"/>'
 };	
 </script>
 
diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index c47d157ece6..88d2a4d2573 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -392,7 +392,7 @@ function accountJsonToDetailsTab() {
   
     if(isAdmin()) {
         if(jsonObj.id != systemAccountId && jsonObj.id != adminAccountId) {   
-            buildActionLinkForTab("Edit account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);  
+            buildActionLinkForTab("label.action.edit.account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);  
              
             if (jsonObj.accounttype == roleTypeUser || jsonObj.accounttype == roleTypeDomainAdmin) {
                 buildActionLinkForTab("Resource limits", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);	                
@@ -533,7 +533,7 @@ function accountUserJSONToTemplate(jsonObj, $template) {
 } 
 
 var accountActionMap = {  
-    "Edit account": {
+    "label.action.edit.account": {
         dialogBeforeActionFn: doEditAccount  
     },
     "Resource limits": {                 
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 99a4c4018ed..72a06a0e67a 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -23,7 +23,12 @@ function buildActionLinkForTab(label, actionMap, $actionMenu, $midmenuItem1, $th
     var apiInfo = actionMap[label];
     var $listItem = $("#action_list_item").clone();
     $actionMenu.find("#action_list").append($listItem.show());
-    $listItem.find("#link").text(label);   
+  
+    if(label in dictionary)
+        $listItem.find("#link").text(dictionary[label]);   
+    else
+        $listItem.find("#link").text(label);   
+        
     $listItem.data("label", label);	  
     $listItem.data("apiInfo", apiInfo);