diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index aa391c08ea..c567aa6a94 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -269,7 +269,8 @@ namespace OpenSim.Framework.Types
                     this.MasterAvatarLastName = (string)configuration_result;
                     break;
                 case "master_avatar_pass":
-                    this.MasterAvatarSandboxPassword = (string)configuration_result;
+                    string tempMD5Passwd = (string)configuration_result;
+                    this.MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + "");
                     break;
             }