diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp
index e3aa0358da5..70d6a03759c 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -5,6 +5,10 @@
 </c:if>
 <fmt:setBundle basename="resources/messages"/>
 
+<span id="message_disable_account" style="display:none;"><fmt:message key="message.disable.account"/></span>
+<span id="message_lock_account" style="display:none;"><fmt:message key="message.lock.account"/></span>
+<span id="message_enable_account" style="display:none;"><fmt:message key="message.enable.account"/></span>
+
 <!-- account detail panel (begin) -->
 <div class="main_title" id="right_panel_header">
     <div class="main_titleicon">
@@ -373,24 +377,6 @@
 	</div>
 </div>
 
-<div id="dialog_disable_account" title="Disable account" style="display:none">
-    <p>
-		<fmt:message key="message.disable.account"/>
-    </p>
-</div>
-
-<div id="dialog_lock_account" title="Lock account" style="display:none">
-    <p>
-		<fmt:message key="message.lock.account"/>
-    </p>
-</div>
-
-<div id="dialog_enable_account" title="Enable account" style="display:none">
-    <p>
-		<fmt:message key="message.enable.account"/>
-    </p>
-</div>
-
 <!-- Add Account Dialog (begin)-->
 <div id="dialog_add_account" title="Add New Account" style="display: none">   
     <div class="dialog_formcontent">
diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index 5786b3aac80..2221d388dd3 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -44,10 +44,7 @@ function accountGetSearchParams() {
 
 function afterLoadAccountJSP() {
     if(isAdmin()) {
-        initDialog("dialog_resource_limits");
-        initDialog("dialog_disable_account");
-        initDialog("dialog_lock_account");
-        initDialog("dialog_enable_account");  
+        initDialog("dialog_resource_limits");            
         initDialog("dialog_edit_user", 450);    
         initDialog("dialog_change_password", 450);    
         initDialog("dialog_add_user", 450);
@@ -736,7 +733,8 @@ function doDisableAccount($actionLink, $detailsTab, $midmenuItem1) {
     var jsonObj = $midmenuItem1.data("jsonObj");    
     var id = jsonObj.id;
     
-    $("#dialog_disable_account")    
+    $("#dialog_confirmation")  
+    .text($("#message_disable_account").text())  
     .dialog('option', 'buttons', {                    
         "Yes": function() { 		                    
             $(this).dialog("close");	
@@ -752,7 +750,8 @@ function doDisableAccount($actionLink, $detailsTab, $midmenuItem1) {
 function doLockAccount($actionLink, $detailsTab, $midmenuItem1) {       
     var jsonObj = $midmenuItem1.data("jsonObj");    
     
-    $("#dialog_lock_account")    
+    $("#dialog_confirmation")
+    .text($("#message_lock_account").text())    
     .dialog('option', 'buttons', {                    
         "Yes": function() { 		                    
             $(this).dialog("close");			
@@ -768,7 +767,8 @@ function doLockAccount($actionLink, $detailsTab, $midmenuItem1) {
 function doEnableAccount($actionLink, $detailsTab, $midmenuItem1) {       
     var jsonObj = $midmenuItem1.data("jsonObj");    
     
-    $("#dialog_enable_account")    
+    $("#dialog_confirmation")  
+    .text($("#message_enable_account").text())  
     .dialog('option', 'buttons', {                    
         "Yes": function() { 		                    
             $(this).dialog("close");