diff --git a/dev/install/config-form.html b/dev/install/config-form.html
index bc7349060..22bc25cc5 100644
--- a/dev/install/config-form.html
+++ b/dev/install/config-form.html
@@ -80,10 +80,26 @@
 										Please see below for details.<br>
 										If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/doku.php?id=server-requirements">server requirements wiki page</a>.
 									</p>
-								<?php } else if(!$dbReq->hasErrors()) { ?>
+								<?php } else if(!$dbReq->hasErrors() && !$adminReq->hasErrors()) { ?>
 									<p class="good">You're ready to install!</p>
 								<?php } ?>
 								
+								<?php if($dbReq->hasErrors()) { ?>
+									<p class="error">
+										The database details don't appear to be correct.  Please <a href="#database_credentials">enter the correct details</a> before installing.
+									</p>
+								<?php } else { ?>
+									<p class="good">
+										These database details look all good!
+									</p>
+								<?php } ?>
+								
+								<?php if($adminReq->hasErrors()) { ?>
+									<p class="error">
+										Please <a href="#AdminAccount">enter a username and password</a> for the default administrator account before installing.
+									</p>
+								<?php } ?>
+								
 								<h3>Template to install:</h3>
 								<ul id="Themes">
 									<li><input type="radio" name="template" value="blackcandy" id="BlackCandy" <?php if(!isset($_POST['template']) || $_POST['template'] == 'blackcandy') {?>checked="checked"<?php }?>><label for="BlackCandy">BlackCandy, default template ready to use.</label></li>
@@ -118,16 +134,6 @@
 							<?php } ?>
 			
 							<h4 class="sectionHeading">Database</h4>
-							<?php if($dbReq->hasErrors()) { ?>
-								<p class="error">
-									These database details don't appear to be correct.  Please enter the correct details before installing.
-								</p>
-							<?php } else { ?>
-								<p class="good">
-									These database details look all good!
-								</p>
-							<?php } ?>
-			
 							<div id="database_credentials" class="section">
 								<?php if($envFileExists) { ?>
 								<div id="use_environment_field" class="field">
@@ -224,6 +230,9 @@
 										<input type="text" class="text" name="admin[surname]" id="admin_surname" value="<?php echo $adminConfig['surname']; ?>">
 									</span>
 								</div>
+								<div class="action">
+									<input type="submit" class="action" value="Re-check requirements">
+								</div>
 							</div>
 							
 							<p id="adminAcc" class="helpText">