diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 9b855236b0a..dffc29740c2 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -673,6 +673,8 @@
                 var password = args.data.password;
                 if (md5Hashed)
                   password = $.md5(password);
+								else
+								  password = todb(password);
                 array1.push("&password=" + password);
 
                 array1.push("&email=" + todb(args.data.email));
@@ -755,6 +757,8 @@
                   var password = args.data.newPassword;
                   if (md5Hashed)
                     password = $.md5(password);
+									else
+									  password = todb(password);
                   $.ajax({
                     url: createURL("updateUser&id=" + args.context.users[0].id + "&password=" + password),
                     dataType: "json",
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 53ad9feab85..4a4ed638535 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -158,7 +158,7 @@
         if (md5HashedLogin)
           password = $.md5(args.data.password);
         else
-          password = args.data.password;
+          password = todb(args.data.password);
         array1.push("&password=" + password);
 
         var domain;
diff --git a/ui/scripts/installWizard.js b/ui/scripts/installWizard.js
index 9e32357b7cd..f496ed76727 100644
--- a/ui/scripts/installWizard.js
+++ b/ui/scripts/installWizard.js
@@ -19,7 +19,7 @@
         url: createURL('updateUser'),
         data: {
           id: cloudStack.context.users[0].userid,
-          password: md5Hashed ? $.md5(args.data.password) : args.data.password
+          password: md5Hashed ? $.md5(args.data.password) : todb(args.data.password)
         },
         dataType: 'json',
         async: true,