diff --git a/setup/config.php b/setup/config.php
index c582d2027e..acaf437638 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -22,32 +22,35 @@
     exit;
   }
   loaddb();
-  if ($newsettings["auth_type"] != "ldap") {
-     setup_header();
-  }
 
   if ($submit) {
-     @$db->query("delete from config");
-     while ($newsetting = each($newsettings)) {
-   	if ($newsetting[0] == "nntp_server") {
- 	     $db->query("select config_value FROM config WHERE config_name='nntp_server'");
+    @$db->query("delete from config");
+    while ($newsetting = each($newsettings)) {
+   	  if ($newsetting[0] == "nntp_server") {
+ 	      $db->query("select config_value FROM config WHERE config_name='nntp_server'");
 	      if ($db->num_rows()) {
-	         $db->next_record();
-  	       if ($db->f("config_value") <> $newsetting[1]) {
-	            $db->query("DELETE FROM newsgroups");
-   	         $db->query("DELETE FROM users_newsgroups");
+	        $db->next_record();
+  	      if ($db->f("config_value") <> $newsetting[1]) {
+	          $db->query("DELETE FROM newsgroups");
+   	        $db->query("DELETE FROM users_newsgroups");
    	      }
 	      }
-   	}
-       $db->query("insert into config (config_name, config_value) values ('" . addslashes($newsetting[0])
-    	  	  . "','" . addslashes($newsetting[1]) . "')");
-     }
-     if ($newsettings["auth_type"] == "ldap") {
-        Header("Location: ldap.php");
-        exit;
-     } else {
-        echo "<center>Your config has been updated<br><a href='".$newsettings["webserver_url"]."/login.php'>Click here to login</a>";
-     }
+   	  }
+      $db->query("insert into config (config_name, config_value) values ('" . addslashes($newsetting[0])
+        . "','" . addslashes($newsetting[1]) . "')");
+    }
+    if ($newsettings["auth_type"] == "ldap") {
+      Header("Location: ldap.php");
+      exit;
+    } else {
+      //echo "<center>Your config has been updated<br><a href='".$newsettings["webserver_url"]."/login.php'>Click here to login</a>";
+      Header("Location: index.php");
+      exit;
+    }
+  }
+
+  if ($newsettings["auth_type"] != "ldap") {
+    show_header("Configuration");
   }
 
   @$db->query("select * from config");
diff --git a/setup/inc/functions.inc.php b/setup/inc/functions.inc.php
index da5b2d7bac..11f0b51878 100644
--- a/setup/inc/functions.inc.php
+++ b/setup/inc/functions.inc.php
@@ -237,20 +237,32 @@
       echo "<br><input type=\"submit\" value=\"Re-Check My Installation\">\n";
       echo '</form>';
       echo '</td></tr>';
-    }elseif ($stage == 2.6) {
+    }elseif ($stage >= 2.6) {
       echo '<tr><td align="center">X</td><td>Your tables are current.';
       echo "<form method=\"POST\" action=\"tables.php\">\n";
       echo "<input type=\"hidden\" name=\"oldversion\" value=\"new\">\n";
-      echo "<br>Insanity: <input type=\"submit\" name=\"action\" value=\"Delete all my tables and data\">, then re-create the tables.\n";
+      echo "<br>Insanity: <input type=\"submit\" name=\"action\" value=\"Delete all my tables and data\">\n";
       echo '</form>';
       echo '</td></tr>';
     }
-    echo '  <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 3 - language management</td><td align="right" bgcolor="486591">&nbsp;</td></tr>';
+    echo '  <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 3 - Configuration</td><td align="right" bgcolor="486591">&nbsp;</td></tr>';
     if ($stage < 3.1) {
       echo '<tr><td align="center">O</td><td>Not ready for this stage yet.</td></tr>';
     }elseif ($stage == 3.1) {
-      echo '<tr><td align="center">O</td><td>stage 3.1.<br></td></tr>';
+      echo '<tr><td align="center">O</td><td>Please phpGroupWare for your environment.';
+      echo "<form method=\"POST\" action=\"config.php\"><input type=\"submit\" value=\"Configure Now\"></form>";
+      echo '</td></tr>';
     }elseif ($stage == 3.2) {
+      echo '<tr><td align="center">X</td><td>Configuration completed.';
+      echo "<form method=\"POST\" action=\"config.php\"><input type=\"submit\" value=\"Edit Current Configuration\"></form>";
+      echo '</td></tr>';
+    }
+    echo '  <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 4 - language management</td><td align="right" bgcolor="486591">&nbsp;</td></tr>';
+    if ($stage < 4.1) {
+      echo '<tr><td align="center">O</td><td>Not ready for this stage yet.</td></tr>';
+    }elseif ($stage == 4.1) {
+      echo '<tr><td align="center">O</td><td>stage 3.1.<br></td></tr>';
+    }elseif ($stage == 4.2) {
       echo '<tr><td align="center">O</td><td>stage 3.2.<br></td></tr>';
     }
     echo '</table>';
diff --git a/setup/index.php b/setup/index.php
index 519551bc39..9ef5df66c5 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -47,8 +47,17 @@
           $db->free();
           if (isset($oldversion)){
             if ($oldversion == $phpgw_info["server"]["version"]){
-              $stage = 2.6;
-              $header_msg = "Stage 2 (Tables are Current)";
+              $db->query("select config_value from config where config_name='freshinstall'");
+              $db->next_record();
+              $configed = $db->f("config_value");
+              $db->free();
+              if ($configed){
+                $stage = 3.1;
+                $header_msg = "Stage 3 (Needs Configuration)";
+              }else{
+                $stage = 3.2;
+                $header_msg = "Stage 3 (Configuration OK)";
+              }
             }else{
               $stage = 2.4;
               $header_msg = "Stage 2 (Tables need upgrading)";
diff --git a/setup/sql/common_default_records.inc.php b/setup/sql/common_default_records.inc.php
index c415eb81bc..d334458d1a 100644
--- a/setup/sql/common_default_records.inc.php
+++ b/setup/sql/common_default_records.inc.php
@@ -47,6 +47,7 @@
     $db->query("insert into config (config_name, config_value) values ('httpproxy_port', '')");
     $db->query("insert into config (config_name, config_value) values ('showpoweredbyon', 'bottom')");
     $db->query("insert into config (config_name, config_value) values ('checkfornewversion', 'False')");
+    $db->query("insert into config (config_name, config_value) values ('freshinstall', 'True')");
   }
 
   if ($useglobalconfigsettings == "on"){