Index: trunk/core/install/step_templates/install_setup.tpl
===================================================================
diff -u -N -r6691 -r7635
--- trunk/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 6691)
+++ trunk/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 7635)
@@ -8,15 +8,15 @@
 		<b>Username<span class="error">*</span>:</b>
 	</td>
 	<td width="80%">
-		<input type="text" name="user_name" value="<?php $this->GetVar('user_name'); ?>" class="text" />
+		<input type="text" name="login" value="" class="text" />
 	</td>
 </tr>
 <tr class="table_color2"> 
 	<td class="text">
 		<b>Password<span class="error">*</span>:</b>
 	</td>
 	<td>
-		<input type="password" name="user_password" class="text" />
+		<input type="password" name="password" class="text" />
 	</td>
 </tr>
 
@@ -25,25 +25,30 @@
 ?>
 <tr class="%4$s"> 
 	<td colspan="2">
-		<input type="radio" value="%1$s" name="inp_opt" id="inp_opt_%1$s"%2$s><label for="inp_opt_%1$s">%3$s</label></span>
+		<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 
 	$option_tpl = ob_get_clean();
 
 	$options = 	Array (
-						6	=>	'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',
-						5	=>	'Change Database Configuration',
-						7	=>	'Fix Paths',
+						'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',
+						'db_reconfig'	=>	'Change Database Configuration',
+						'fix_paths'		=>	'Fix Paths',
 				);
 	
+	$upgradable_modules = $this->GetUpgradableModules();
+	if (!$upgradable_modules) {
+		unset($options['upgrade']);
+	}
+				
 	$td_class = 'table_color1';			
 	foreach ($options as $option_key => $option_title) {
-		$checked = $this->GetVar('inp_opt') == $option_key ? ' checked' : '';
+		$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';
 	}