Index: trunk/admin/install.php
===================================================================
diff -u -r744 -r773
--- trunk/admin/install.php	(.../install.php)	(revision 744)
+++ trunk/admin/install.php	(.../install.php)	(revision 773)
@@ -170,6 +170,8 @@
 	return stripslashes($str);
 }
 
+$skip_step = false;
+
 require_once($pathtoroot.$admin."/install/inst_ado.php");
 $helpURL = $rootURL.$admin.'/help/install_help.php?destform=popup&help_usage=install';
 ?>
@@ -1503,12 +1505,6 @@
     $state="lang_select";
 }
 
-if($state=="lang_select")
-{
-	$Packs = GetLanguageList();
-	$include_file = $pathtoroot.$admin."/install/lang_select.php";
-}
-
 if($state=="modselect")
 {
  /* /admin/install.php */
@@ -1534,9 +1530,22 @@
     $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '".$_SERVER['DOCUMENT_ROOT'].$sitepath."admin/backupdata' WHERE VariableName='Backup_Path'";
     $ado->Execute($sql);
     $Modules = inst_GetModuleList();
-    $include_file = $pathtoroot.$admin."/install/modselect.php";
+    
+    if (count($Modules) > 0) {    
+    	$include_file = $pathtoroot.$admin."/install/modselect.php";
+    }
+    else {
+    	$state = "lang_select";
+    	$skip_step = true;
+    }
 }
 
+if($state=="lang_select")
+{
+	$Packs = GetLanguageList();
+	$include_file = $pathtoroot.$admin."/install/lang_select.php";
+}
+
 if(substr($state,0,10)=="postconfig")
 {
     $p = explode("_",$state);
@@ -1810,7 +1819,12 @@
 if ($state == "warning") {
 	$tmp_step--;
 	$next_step = $tmp_step + 1;
-}	
+}
+
+if ($skip_step) {
+	$tmp_step++;
+	$next_step = $tmp_step + 1;
+}
 ?>
 	
 	<tr height="100%">