diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 9b565c62d90..525ee5947f4 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -173,7 +173,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);
@@ -262,6 +262,7 @@
               edit: {
                 label: 'message.edit.account',
                 action: function(args) {
+                  var errorMsg = "";
                   var accountObj = args.context.accounts[0];
 
                   var array1 = [];
@@ -273,7 +274,12 @@
                     async: false,
                     success: function(json) {
                       accountObj = json.updateaccountresponse.account;
+                    },
+                    error: function(json) {
+                      errorMsg = parseXMLHttpResponse(json);
+                      args.response.error(errorMsg);
                     }
+ 
                   });
 
                   $.ajax({
@@ -321,6 +327,7 @@
                     }
                   });
 
+                  if(errorMsg == "")
                   args.response.success({data: accountObj});
                 }
               },