diff --git a/setup/migrate/templates/complete.tpl b/setup/migrate/templates/complete.tpl
index 651be0c..caabd77 100644
--- a/setup/migrate/templates/complete.tpl
+++ b/setup/migrate/templates/complete.tpl
@@ -19,15 +19,9 @@
 		In order to complete the upgrade process please start the Zend Server MySQL service and then click <b>Next</b> to continue (<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Complete" target="_blank">Click here for help</a>). 
 		<br /><br />
 		<?php if(!empty($errors)) { ?>
-<!--		<span class='<?php //echo $ktmysql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>-->
-		<?php //echo $ktmysql['name']; ?>
-		<?php //echo $ktmysql['msg']; ?>
-<!--		<br /><br />-->
-		<?php //if (WINDOWS_OS) { ?>
-		<span class='<?php echo $zmysql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-		<?php echo $zmysql['name']; ?>
-		<?php echo $zmysql['msg']; ?>
-		<?php //} ?>
+			<span class='<?php echo $zmysql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+			<?php echo $zmysql['name']; ?>
+			<?php echo $zmysql['msg']; ?>
 		<?php } ?>
 	</div>
 <!--    <input class="button_next" type="submit" value="Continue Installation" name="BInstall"/>-->
diff --git a/setup/upgrade/steps/upgradeComplete.php b/setup/upgrade/steps/upgradeComplete.php
index 6047718..89f5378 100644
--- a/setup/upgrade/steps/upgradeComplete.php
+++ b/setup/upgrade/steps/upgradeComplete.php
@@ -55,6 +55,7 @@ class upgradeComplete extends Step {
 		 	$this->temp_variables['isCE'] = true;
         $this->doRun();
         $this->storeSilent();
+        $this->util->deleteMigrateFile();
     	return 'landing';
     }
     
diff --git a/setup/upgrade/templates/complete.tpl b/setup/upgrade/templates/complete.tpl
index d782900..0cb0af9 100644
--- a/setup/upgrade/templates/complete.tpl
+++ b/setup/upgrade/templates/complete.tpl
@@ -51,5 +51,6 @@
 		</a>
 	</div>
 	</div>
-	<a href="../../login.php" class="back button_next" style="width:50px;" onclick="javascript:{w.clearSessions();}">Finish</a>
+<!--	<a href="../../login.php" class="back button_next" style="width:50px;" onclick="javascript:{w.clearSessions();}">Finish</a>-->
+		<input type="submit" name="Next" value="Finish" class="button_next"/>
 </form>
\ No newline at end of file
diff --git a/setup/upgrade/upgradeWizard.php b/setup/upgrade/upgradeWizard.php
index 71b649c..f41a73e 100644
--- a/setup/upgrade/upgradeWizard.php
+++ b/setup/upgrade/upgradeWizard.php
@@ -227,6 +227,8 @@ class UpgradeWizard {
 		$response = $this->systemChecks();
 		if($this->util->installationSpecified()) { // Check if the migrator needs to be accessed
 			$this->util->redirect('../wizard/index.php?step_name=install_type');
+		} elseif ($this->util->finishInstall()) { // Check if the installer has completed
+			$this->util->redirect('../../login.php');
 		}
 		if($response === true) {
 			$this->displayUpgrader();
diff --git a/setup/wizard/installUtil.php b/setup/wizard/installUtil.php
index 38cbe9d..9a4f87a 100644
--- a/setup/wizard/installUtil.php
+++ b/setup/wizard/installUtil.php
@@ -522,23 +522,6 @@ class InstallUtil {
     	}
     }
 
-	/**
-	* Check if system needs to be accessed
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @param none
-	* @return boolean
- 	*/
-    public function finishSpecified() {
-    	if(isset($_GET['Finish'])) {
-        	if($_GET['Finish'] == "Finish") {
-            	return true;
-        	}
-    	}
-
-        return false;
-    }
 
 	/**
 	* Check if system needs to be migrated
@@ -559,7 +542,10 @@ class InstallUtil {
 	}
 
 	public function upgradeInstall() {
-    	if(isset($_POST['Next'])) {
+		if(isset($_GET['Upgrade'])) {
+			return true;
+		}
+    	if(isset($_GET['Next'])) {
         	if($_POST['Next'] == "Upgrade") {
             	return true;
         	}
@@ -569,6 +555,24 @@ class InstallUtil {
 	}
 	
 	/**
+	* Check if system needs to be accessed
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @param none
+	* @return boolean
+ 	*/
+	public function finishInstall() {
+    	if(isset($_GET['Next'])) {
+        	if($_GET['Next'] == "Finish") {
+            	return true;
+        	}
+    	}
+
+        return false;
+	}
+	
+	/**
 	* Check if system needs to be migrated
 	*
 	* @author KnowledgeTree Team
diff --git a/setup/wizard/installWizard.php b/setup/wizard/installWizard.php
index 4e56516..978ea2f 100644
--- a/setup/wizard/installWizard.php
+++ b/setup/wizard/installWizard.php
@@ -104,18 +104,6 @@ class InstallWizard {
 	public function __construct(){}
 
 	/**
-	* Check if system has been install
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @param none
-	* @return boolean
- 	*/
-	private function isSystemInstalled() {
-		return $this->util->isSystemInstalled();
-	}
-
-	/**
 	* Display the wizard
 	*
 	* @author KnowledgeTree Team
@@ -280,17 +268,18 @@ class InstallWizard {
 		} elseif ($this->getBypass() === "0") {
 			$this->createInstallFile();
 		}
-		if(!$this->isSystemInstalled()) { // Check if the systems not installed
+		if ($this->util->finishInstall()) { // Check if the installer has completed
+			$this->util->redirect('../../login.php');
+		} elseif ($this->util->upgradeInstall()) { // Check if the upgrader needs to be accessed
+				$this->util->redirect('../upgrade/index.php');
+		}
+		if(!$this->util->isSystemInstalled()) { // Check if the systems not installed
 			if($this->util->loginSpecified()) { // Back to wizard from upgrader
 				$this->util->redirect('../../control.php');
 			} elseif($this->util->migrationSpecified()) { // Check if the migrator needs to be accessed
 				$this->util->redirect('../migrate/index.php?');
 			} elseif ($this->util->upgradeSpecified()) { // Check if the upgrader needs to be accessed
 				$this->util->redirect('../upgrade/index.php?action=installer');
-			} elseif ($this->util->finishSpecified()) { // Check if the installer has completed
-				$this->util->redirect('../../login.php');
-			} elseif ($this->util->upgradeInstall()) { // Check if the upgrader needs to be accessed
-				$this->util->redirect('../upgrade/index.php');
 			}
 			$response = $this->systemChecks();
 			if($response === true) {
diff --git a/setup/wizard/templates/complete.tpl b/setup/wizard/templates/complete.tpl
index 2eaec93..331d251 100644
--- a/setup/wizard/templates/complete.tpl
+++ b/setup/wizard/templates/complete.tpl
@@ -199,11 +199,11 @@
         	$redirect = "http://".$_SERVER['SERVER_NAME'].":$port".$root_url."/admin.php";
 	?>
 	<?php if($migrate_check) { ?>
-		<a href="../upgrade/index.php" class="back button_next" style="width:30px;" onclick="javascript:{w.clearSessions();}">Next</a>
-<!--		<input type="submit" name="Upgrade" value="Next" class="button_next"/>-->
+<!--		<a href="../upgrade/index.php" class="back button_next" style="width:30px;" onclick="javascript:{w.clearSessions();}">Next</a>-->
+		<input type="submit" name="Upgrade" value="Next" class="button_next"/>
     <?php } else { ?>
-    	<a href="../../login.php" class="back button_next" style="width:50px;" onclick="javascript:{w.clearSessions();}">Finish</a>
-<!--		<input type="submit" name="Finish" value="Finish" class="button_next"/>-->
+<!--    	<a href="../../login.php" class="back button_next" style="width:50px;" onclick="javascript:{w.clearSessions();}">Finish</a>-->
+		<input type="submit" name="Next" value="Finish" class="button_next"/>
     <?php } ?>
 </form>
 <?php if (AJAX) { echo $html->js('form.js'); } ?>
\ No newline at end of file