diff --git a/lib/os/class.ISPConfigDebianOS.inc.php b/lib/os/class.ISPConfigDebianOS.inc.php
index 309971d27cbb89ca0ccfaa9955f4b7a500590496..bd0e76d76281f656c9c6e1463e753d536267aef9 100644
--- a/lib/os/class.ISPConfigDebianOS.inc.php
+++ b/lib/os/class.ISPConfigDebianOS.inc.php
@@ -1190,8 +1190,7 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 	protected function installRoundcube($mysql_root_pw) {
 		ISPConfigLog::info('Installing roundcube.', true);
 
-		$cmd = 'APP_PASS="' . ISPConfigFunctions::generatePassword(15) . '"' . "\n";
-		$cmd .= 'ROOT_PASS="' . $mysql_root_pw . '"' . "\n";
+		$cmd  = 'ROOT_PASS="' . $mysql_root_pw . '"' . "\n";
 		$cmd .= 'APP_DB_PASS="' . ISPConfigFunctions::generatePassword(15) . '"' . "\n";
 		$cmd .= 'echo "roundcube-core roundcube/dbconfig-install boolean true" | debconf-set-selections 2>&1' . "\n";
 		$cmd .= 'echo "roundcube-core roundcube/database-type select mysql" | debconf-set-selections 2>&1' . "\n";
@@ -1214,14 +1213,18 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 			'/^\s*\$config\s*\[["\']smtp_user["\']\]\s*=.*$/m' => '$config[\'smtp_user\'] = \'%u\';',
 			'/^\s*\$config\s*\[["\']smtp_pass["\']\]\s*=.*$/m' => '$config[\'smtp_pass\'] = \'%p\';'
 		);
-		$result = $this->replaceContents('/etc/roundcube/config.inc.php', $replacements);
+		$this->replaceContents('/etc/roundcube/config.inc.php', $replacements);
 
 		if(ISPConfig::$WEBSERVER === ISPC_WEBSERVER_APACHE) {
 			$replacements = array(
-				'/^\s*#*\s*Alias\s+\/roundcube\s+\/var\/lib\/roundcube\/public\_html\s*$/m' => 'Alias /webmail /var/lib/roundcube/public_html',
-				'/^\s*#*\s*Alias\s+\/roundcube\s+\/var\/lib\/roundcube\s*$/m' => 'Alias /webmail /var/lib/roundcube'
+				'/^\s*#*\s*Alias\s+\/roundcube\s+\/var\/lib\/roundcube\/public\_html\s*$/m' => 'Alias /webmail /var/lib/roundcube/public_html' . "\n",
+				'/^\s*#*\s*Alias\s+\/roundcube\s+\/var\/lib\/roundcube\s*$/m' => 'Alias /webmail /var/lib/roundcube' . "\n",
+				'/(<Directory \/var\/lib\/roundcube\/public\_html\/>\n)(.*\n)(.*)/' => [
+					'replace' => '$1$2  DirectoryIndex index.php' . "\n" . '$3',
+					'ifnot' => 'DirectoryIndex'
+				],
 			);
-			$result = $this->replaceContents('/etc/apache2/conf-enabled/roundcube.conf', $replacements);
+			$this->replaceContents('/etc/roundcube/apache.conf', $replacements);
 		} elseif(ISPConfig::$WEBSERVER === ISPC_WEBSERVER_NGINX) {
 			symlink('/usr/share/roundcube', '/usr/share/squirrelmail');
 		}