diff --git a/core/setup/controller.php b/core/setup/controller.php
index 8465008d57..cc7f4a3a98 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -55,6 +55,14 @@ class Controller {
 		$post = $this->loadAutoConfig($post);
 		$opts = $this->getSystemInfo();
 
+		// convert 'abcpassword' to 'abcpass'
+		if (isset($post['adminpassword'])) {
+			$post['adminpass'] = $post['adminpassword'];
+		}
+		if (isset($post['dbpassword'])) {
+			$post['dbpass'] = $post['dbpassword'];
+		}
+
 		if(isset($post['install']) AND $post['install']=='true') {
 			// We have to launch the installation process :
 			$e = \OC\Setup::install($post);