diff --git a/build-base.php b/build-base.php
index 507abb266..29700db22 100644
--- a/build-base.php
+++ b/build-base.php
@@ -54,7 +54,3 @@ while (!feof($sql_fh)) {
 fclose($sql_fh);
 
 require 'includes/sql-schema/update.php';
-
-if( isset($_SESSION['stage']) ) {
-    $_SESSION['build-ok'] = true;
-}
diff --git a/html/install.php b/html/install.php
index 663c4cf44..8619e7b4a 100644
--- a/html/install.php
+++ b/html/install.php
@@ -318,7 +318,12 @@ elseif($stage == "2") {
     $config['db_name']=$dbname;
     $config['db']['extension']='mysqli';
     $sql_file = '../build.sql';
-    require '../build-base.php';
+    if ($_REQUEST['offset'] =< 100) {
+        require '../build-base.php';
+    }
+    else {
+        require '../includes/sql-schema/update.php';
+    }
 ?>
 </pre>
      </div>
diff --git a/includes/sql-schema/update.php b/includes/sql-schema/update.php
index 841faafcd..45bf671b2 100644
--- a/includes/sql-schema/update.php
+++ b/includes/sql-schema/update.php
@@ -168,5 +168,8 @@ foreach ($filelist as $file) {
 
 if ($updating) {
     echo "-- Done\n";
+    if( isset($_SESSION['stage']) ) {
+        $_SESSION['build-ok'] = true;
+    }
 }