diff -ruN phpki-ng.old/phpki-ng-0.84/include/common.php phpki-ng/phpki-ng-0.84/include/common.php
--- phpki-ng.old/phpki-ng-0.84/include/common.php	2021-03-18 13:01:29.070643552 +0100
+++ phpki-ng/phpki-ng-0.84/include/common.php	2021-03-18 13:01:57.166094491 +0100
@@ -38,7 +38,7 @@
     ?>
     <!DOCTYPE html>
     <head>
-    <meta charset="utf-8">
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <title>PHPki: <?php echo $title?> </title>
     <link rel="stylesheet" type="text/css" href="<?php echo $style_css?>">
     <script type="text/javascript" language="javascript">
@@ -130,7 +130,7 @@
         <?php
     }
 
-    ?><hr style="width:99%; align:left; color:#99caff;" /><?php
+    ?><hr style="width:99%; color:#99caff;" /><?php
 }
 
 
diff -ruN phpki-ng.old/phpki-ng-0.84/include/my_functions.php phpki-ng/phpki-ng-0.84/include/my_functions.php
--- phpki-ng.old/phpki-ng-0.84/include/my_functions.php	2021-03-18 13:01:29.113644244 +0100
+++ phpki-ng/phpki-ng-0.84/include/my_functions.php	2021-03-18 13:01:57.166094491 +0100
@@ -305,3 +305,27 @@
         return null;
     }
 }
+
+# Used in setup
+function flush_exec($command, $line_length = 200)
+{
+        $handle = popen("$command 2>&1", 'r');
+
+        $line = '';
+    while (! feof($handle)) {
+            $chr = fread($handle, 1);
+            $line .= $chr;
+        if ($chr == "\n") {
+                print str_replace("\n", "<br>\n", $line);
+                $line = '';
+                flush();
+        } elseif (strlen($line) > $line_length) {
+                print $line."<br>\n";
+                $line = '';
+                flush();
+        }
+    }
+        print $line."<br>\n";
+    flush();
+    return;
+}
diff -ruN phpki-ng.old/phpki-ng-0.84/setup.php-presetup phpki-ng/phpki-ng-0.84/setup.php-presetup
--- phpki-ng.old/phpki-ng-0.84/setup.php-presetup	2021-03-18 13:01:29.116644288 +0100
+++ phpki-ng/phpki-ng-0.84/setup.php-presetup	2021-03-18 13:01:57.166094491 +0100
@@ -3,29 +3,6 @@
 include('./include/my_functions.php');
 include('./include/common.php');
 
-function flush_exec($command, $line_length = 200)
-{
-        $handle = popen("$command 2>&1", 'r');
-
-        $line = '';
-    while (! feof($handle)) {
-            $chr = fread($handle, 1);
-            $line .= $chr;
-        if ($chr == "\n") {
-                print str_replace("\n", "<br>\n", $line);
-                $line = '';
-                flush();
-        } elseif (strlen($line) > $line_length) {
-                print $line."<br>\n";
-                $line = '';
-                flush();
-        }
-    }
-        print $line."<br>\n";
-    flush();
-    return;
-}
-
 $version = PHPKI_VERSION;
 
 # Who does the webserver run as (apache,www-data,etc)?
@@ -161,12 +138,16 @@
                 $er .= 'E-mail address ('. htvar($contact) . ') may be invalid.<br>';
         }
 
-        if (strpos($store_dir, $_SERVER['DOCUMENT_ROOT']) === 0) {
-            $er .= 'Store directory must exist somewhere outside of DOCUMENT_ROOT ('.$_SERVER['DOCUMENT_ROOT'].').<br>';
+        // reetp this was the wrong way round - swapped
+        // strpos ($haystack, $needle)
+        if (strpos($_SERVER['DOCUMENT_ROOT'], $store_dir) === 0) {
+            $er .= 'Store directory ('.$store_dir.') must exist somewhere outside of DOCUMENT_ROOT ('.$_SERVER['DOCUMENT_ROOT'].').<br>';
         }
 
-        if (strpos($store_dir, dirname($_SERVER['SCRIPT_FILENAME'])) === 0) {
-            $er .= 'Store directory cannot exist within the PHPki installation directory ('.dirname($_SERVER['SCRIPT_FILENAME']).').<br>';
+        // reetp this was the wrong way round - swapped
+        // strpos ($haystack, $needle)
+        if (strpos(dirname($_SERVER['SCRIPT_FILENAME']), $store_dir) === 0) {
+            $er .= 'Store directory ('.$store_dir.') cannot exist within the PHPki installation directory ('.dirname($_SERVER['SCRIPT_FILENAME']).').<br>';
         }
 
         if (! $er) {
@@ -184,10 +165,10 @@
                     $er .= "The store directory \"$store_dir\" is not readable by the web server user \"$uname\"<br>";
                 }
                 if (! is_writeable($store_dir)) {
-                    $er .= "The store directory \"$store_dir\: is not writeable by the web server user \"$uname\"<br>";
+                    $er .= "The store directory \"$store_dir\: is not writable by the web server user \"$uname\"<br>";
                 }
             } else {
-                $er .= "Store directory \"$store_dir\" does not exist.  You will have to manually create it as desribed in the setup form.<br>";
+                $er .= "Store directory \"$store_dir\" does not exist.  You will have to manually create it as described in the setup form.<br>";
             }
         }
 
@@ -1227,9 +1208,6 @@
        This may take a few minutes. Please do not interrupt the process.....</center>
     </p>
 
-    <p><center><font color=red>Please click the Submit button ONCE and be patient.</font><br />
-       This may take a few minutes. Please do not interrupt the process.....</center>
-    </p>
     <p>
     <center><input style="border: 1px solid red; padding: 10px;" type=submit name=submit value=Submit></center>
     <input type=hidden name=stage value='validate'>
