diff --git a/ui/old/scripts/cloud.core.init.js b/ui/old/scripts/cloud.core.init.js
index 380bb770c82..cbc0d3406d4 100644
--- a/ui/old/scripts/cloud.core.init.js
+++ b/ui/old/scripts/cloud.core.init.js
@@ -16,7 +16,8 @@
  * 
  */
 // Default password is MD5 hashed.  Set the following variable to false to disable this.
-var md5Hashed = false;
+var md5Hashed = true;
+var md5HashedLogin = false;
  
 $(document).ready(function() { 
 	function initUI() {
@@ -659,7 +660,7 @@ $(document).ready(function() {
 		array1.push("&username="+encodeURIComponent(username));
 		
 		var password = $("#account_password").val();
-		if (md5Hashed) {
+		if (md5HashedLogin) {
 			password = $.md5(password);
 		} 
 		array1.push("&password="+password);
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 955aaa9b82f..a1d2caa3a89 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -136,7 +136,7 @@
         array1.push("&username=" + encodeURIComponent(args.data.username));
 
         var password;
-        if (md5Hashed)
+        if (md5HashedLogin)
           password = $.md5(args.data.password);
         else
           password = args.data.password;
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index e83f0291f55..0d0daf1c757 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -22,7 +22,8 @@ var ERROR_INTERNET_CANNOT_CONNECT = 12029;
 var ERROR_VMOPS_ACCOUNT_ERROR = 531;
 
 // Default password is MD5 hashed.  Set the following variable to false to disable this.
-var md5Hashed = false;
+var md5Hashed = true;
+var md5HashedLogin = false;
 
 //page size for API call (e.g."listXXXXXXX&pagesize=N" )
 var pageSize = 50;