diff --git a/install/install.php b/install/install.php
index 65a7f22e9e3cf385d9e1176cf14196148e697bd3..8c5ebf96431194cabd7ed929615ba2eafa800b2c 100644
--- a/install/install.php
+++ b/install/install.php
@@ -288,6 +288,23 @@ if($install_mode == 'Standard') {
 	//** Configure ISPConfig :-)
 	if(strtolower($inst->simple_query('Install ISPConfig',array('y','n'),'y')) == 'y') {
 		swriteln('Installing ISPConfig');
+		
+		//** We want to check if the server is a module or cgi based php enabled server
+		//** TODO: Don't always ask for this somehow ? 
+		$fast_cgi = $inst->simple_query('CGI PHP Enabled Server?', array('yes','no'),'no');
+
+		if($fast_cgi == 'yes') {
+	 		$alias = $inst->free_query('Script Alias', '/php/');
+	 		$path = $inst->free_query('Script Alias Path', '/path/to/cgi/bin');
+	 		$inst->conf['apache']['vhost_cgi_alias'] = sprintf('ScriptAlias %s %s', $alias, $path);
+		} else {
+	 		$inst->conf['apache']['vhost_cgi_alias'] = "";
+		}
+
+		//** Customise the port ISPConfig runs on
+		$inst->conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
+		
+		
 		$inst->install_ispconfig();
 		
 		//* Configure ISPConfig