Index: branches/RC/core/install/step_templates/install_setup.tpl
===================================================================
diff -u -r8929 -r10832
--- branches/RC/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 8929)
+++ branches/RC/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 10832)
@@ -3,15 +3,15 @@
 		In order to use the installation tool, please provide your Intechnic account information:
 	</td>
 </tr>
-<tr class="table-color2"> 
+<tr class="table-color2">
 	<td class="text">
 		<b>Username<span class="error">*</span>:</b>
 	</td>
 	<td width="80%">
-		<input type="text" name="login" value="" class="text" />
+		<input type="text" name="login" value="<?php echo $this->GetVar('login'); ?>" class="text" />
 	</td>
 </tr>
-<tr class="table-color2"> 
+<tr class="table-color2">
 	<td class="text">
 		<b>Password<span class="error">*</span>:</b>
 	</td>
@@ -23,34 +23,33 @@
 <?php
 	ob_start();
 ?>
-<tr class="%4$s"> 
+<tr class="%4$s">
 	<td colspan="2">
 		<input type="radio" value="%1$s" name="next_preset" id="next_preset_%1$s"%2$s><label for="next_preset_%1$s">%3$s</label></span>
 	</td>
-</tr>				      
-<?php 
+</tr>
+<?php
 	$option_tpl = ob_get_clean();
 
 	$options = 	Array (
 						'upgrade'		=>	'Upgrade In-Portal',
 						1				=>	'Clean out the In-Portal database and reinstall',
-						4				=>	'Clean out the In-Portal database and reinstall from backup',
 						2				=>	'Install to a new database',
-						3				=>	'Update License Information',
+						'update_license'=>	'Update License Information',
 						'db_reconfig'	=>	'Change Database Configuration',
 						'fix_paths'		=>	'Fix Paths',
 				);
-	
+
 	$upgradable_modules = $this->GetUpgradableModules();
 	if (!$upgradable_modules) {
 		unset($options['upgrade']);
 	}
-				
-	$td_class = 'table-color1';			
+
+	$td_class = 'table-color1';
 	foreach ($options as $option_key => $option_title) {
 		$checked = $this->GetVar('next_preset') == $option_key ? ' checked' : '';
 		echo sprintf($option_tpl, $option_key, $checked, $option_title, $td_class);
 		$td_class = ($td_class == 'table-color1') ? 'table-color2' : 'table-color1';
 	}
-	
+
 ?>
\ No newline at end of file