diff --git a/install/install.php b/install/install.php
index 02912d6394086885fff547431ae9d7c6281a3c53..a8b772a3d465d87d2d937762e9205a4dbe1ded03 100644
--- a/install/install.php
+++ b/install/install.php
@@ -201,14 +201,15 @@ if($install_mode == 'Standard') {
 	// $conf['server_id'] = $inst->free_query('Unique Numeric ID of the server','1');
 	// Server ID is an autoInc value of the mysql database now
 	
-	if(strtolower($inst->simple_query('Create Database',array('y','n'),'y')) == 'y') {
+	if(strtolower($inst->simple_query('Shall this server join a existing ISPConfig installation? If not, we will create a new database now',array('y','n'),'y')) == 'n') {
 		//* Create the mysql database
 		$inst->configure_database();
 		system('/etc/init.d/mysql restart');
-		
-		//* Insert the Server record into the database
-		$inst->add_database_server_record();
 	}
+		
+	//* Insert the Server record into the database
+	$inst->add_database_server_record();
+
 	
 	if(strtolower($inst->simple_query('Configure Mail', array('y','n') ,'y') ) == 'y') {