diff --git a/www/index.php b/www/index.php
index 1c7824b393..9b934ac219 100644
--- a/www/index.php
+++ b/www/index.php
@@ -38,7 +38,7 @@ $common = $app->loadCommon();
 
 /* Check for need upgrade. */
 $config->installedVersion = $common->loadModel('setting')->getVersion();
-if(version_compare($config->version, $config->installedVersion, '>')) die(header('location: upgrade.php'));
+if(!(!is_numeric($config->version{0}) and $config->version{0} != $config->installedVersion{0}) and version_compare($config->version, $config->installedVersion, '>')) die(header('location: upgrade.php'));
 
 $app->parseRequest();
 $common->checkPriv();
diff --git a/www/js/my.full.js b/www/js/my.full.js
index cc8f4548cd..1d6e4a83f2 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -417,13 +417,12 @@ function setOuterBox()
     var headerH   = $('#header').height();
     var navbarH   = $('#modulemenu').parent().parent().height();
     var footerH   = $('#footer').height() + 15;
-    if(document.documentElement.clientHeight >= document.documentElement.scrollHeight)
-    {
-        var outerH = winHeight - headerH - footerH - navbarH - 37;
-        if ($.browser.msie && ($.browser.version == "6.0") && !$.support.style) outerH = winHeight - headerH - footerH - 98;
-        if ($.browser.msie && ($.browser.version == "6.0")) $('.outer').css('height', outerH);
-        $('.outer').css('min-height', outerH);
-    } 
+
+    var outerH = winHeight - headerH - footerH - navbarH - 37;
+    if ($.browser.msie && ($.browser.version == "6.0") && !$.support.style) outerH = winHeight - headerH - footerH - 98;
+    if ($.browser.msie && ($.browser.version == "6.0")) $('.outer').css('height', outerH);
+    $('.outer').css('min-height', outerH);
+    
     if($.browser.msie && ($.browser.version == "6.0") && !$.support.style)
     {
         winWidth -= 49;