diff --git a/docs/autoinstall_samples/autoinstall.conf_sample.php b/docs/autoinstall_samples/autoinstall.conf_sample.php
index c55add3a8ab8aa05dc423289d71d4a314a3beb14..59a6f6e5f7fc09b37e600414734eb2519d92c5b5 100644
--- a/docs/autoinstall_samples/autoinstall.conf_sample.php
+++ b/docs/autoinstall_samples/autoinstall.conf_sample.php
@@ -11,6 +11,7 @@ $autoinstall['mysql_charset'] = 'utf8'; // default: utf8
 $autoinstall['http_server'] = 'nginx'; // apache (default), nginx
 $autoinstall['ispconfig_port'] = '8080'; // default: 8080
 $autoinstall['ispconfig_use_ssl'] = 'y'; // y (default), n
+$autoinstall['ispconfig_admin_password'] = 'admin'; // default: admin
 
 /* SSL Settings */
 $autoinstall['ssl_cert_country'] = 'AU';
diff --git a/docs/autoinstall_samples/autoinstall.ini.sample b/docs/autoinstall_samples/autoinstall.ini.sample
index 4abb28dec5b5109faeff2b58375abdeef9904096..e3839c2edfd34ebd5cf17d2075608bf5b1f02602 100644
--- a/docs/autoinstall_samples/autoinstall.ini.sample
+++ b/docs/autoinstall_samples/autoinstall.ini.sample
@@ -10,6 +10,7 @@ mysql_charset=utf8
 http_server=apache
 ispconfig_port=8080
 ispconfig_use_ssl=y
+ispconfig_admin_password=admin
 
 [ssl_cert]
 ssl_cert_country=AU
diff --git a/install/install.php b/install/install.php
index 1e0899f02b9a7bcf92be75c203edfe6ea79e1e70..6a1352944540485245f9ad9044753294d8895994 100644
--- a/install/install.php
+++ b/install/install.php
@@ -546,7 +546,7 @@ if($install_mode == 'standard' || strtolower($inst->simple_query('Install ISPCon
 
 	//** Customise the port ISPConfig runs on
 	$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080','ispconfig_port');
-	$conf['interface_password'] = $inst->free_query('Admin password', 'admin');
+	$conf['interface_password'] = $inst->free_query('Admin password', 'admin','ispconfig_admin_password');
 	if($conf['interface_password'] != 'admin') {
 		$check = false;
 		do {