diff --git a/setup.php-presetup b/setup.php-presetup
index 01fe8eb..8607e9e 100644
--- a/setup.php-presetup
+++ b/setup.php-presetup
@@ -192,6 +192,9 @@ switch ($stage) {
                 printFooter();
                 break;
         }
+  
+        // Here we have "if (not $er)" then fall through to case 'write'
+        // It's pretty crappy coding TBH
 
     case 'write':
         printHeader('about');
@@ -787,14 +790,26 @@ EOS;
         }
         ?>
         <p><br><br>
-        <form action=index.php>
+        <form action='<?php echo $PHP_SELF?>' method=post>
         <input type=submit name=submit value="Proceed To The PHPki Main Menu">
+        <input type=hidden name=stage value=finished>
         </form>
         </center>
         <?php
         printFooter();
         break;
 
+    case 'finished':
+        // We get here if we complete the previous section
+        // if OS = SME the go to server manager else, reload
+        if (getOSInformation){
+            $location = "/server-manager/cgi-bin/phpki";
+        } else {
+            $location = $PHP_SELF;
+        }
+        echo '<META HTTP-EQUIV="Refresh" Content="0; URL=' . $location . '">';
+        exit; 
+
     default:
         if (! $country) {
             $country = $config['country'];