diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 6f30963e242..382510e849a 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -177,7 +177,7 @@
               action: function(args) {
                 var array1 = [];
                 array1.push("&username=" + todb(args.data.username));
-
+                var errorMsg = "";
                 var password = args.data.password;
                 if (md5Hashed)
                   password = $.md5(password);
@@ -266,6 +266,7 @@
               edit: {
                 label: 'message.edit.account',
                 action: function(args) {
+                  var errorMsg = "";
                   var accountObj = args.context.accounts[0];
 
                   var array1 = [];
@@ -277,7 +278,12 @@
                     async: false,
                     success: function(json) {
                       accountObj = json.updateaccountresponse.account;
+                    },
+                    error: function(json) {
+                      errorMsg = parseXMLHttpResponse(json);
+                      args.response.error(errorMsg);
                     }
+ 
                   });
 
                   $.ajax({
@@ -325,6 +331,7 @@
                     }
                   });
 
+                  if(errorMsg == "")
                   args.response.success({data: accountObj});
                 }
               },