Index: branches/unlabeled/unlabeled-1.107.2/admin/install.php
===================================================================
diff -u -r6096 -r6237
--- branches/unlabeled/unlabeled-1.107.2/admin/install.php	(.../install.php)	(revision 6096)
+++ branches/unlabeled/unlabeled-1.107.2/admin/install.php	(.../install.php)	(revision 6237)
@@ -382,8 +382,14 @@
 		{
 			$RootPass = $rs->fields["VariableValue"];
 
-			if(strlen($RootPass)>0)
-			$LoggedIn = ($RootPass==md5($_POST["UserPass"]));
+			if(strlen($RootPass)>0) {
+				if (ConvertVersion($g_InPortal) >= ConvertVersion("1.2.1")) {
+					$LoggedIn = ($RootPass==md5(md5($_POST["UserPass"]).'b38'));
+				}
+				else {
+					$LoggedIn = ($RootPass==md5($_POST["UserPass"]));
+				}
+			}
 		}
 		else {
 			$login_err_mesg = 'Invalid username or password';
@@ -1361,7 +1367,7 @@
   }
   else
   {
-  	  $pass = md5($pass);
+  	  $pass = md5(md5($pass).'b38');
       $sql = '	UPDATE '.$g_TablePrefix.'ConfigurationValues
       			SET VariableValue = '.$ado->qstr($pass).'
       			WHERE VariableName = "RootPass";';