diff --git a/optional/postgresql/start.py b/optional/postgresql/start.py
index d318d4d9..e34e157e 100755
--- a/optional/postgresql/start.py
+++ b/optional/postgresql/start.py
@@ -37,7 +37,6 @@ if not os.listdir("/data"):
                 rec.write("restore_command = 'gunzip < /backup/wal_archive/%f > %p'\n")
                 rec.write("standby_mode = off\n")
             os.system("chown postgres:postgres /data/recovery.conf")
-            #os.system("sudo -u postgres pg_ctl start -D /data -o '-h \"''\" '")
     else:
         # Bootstrap the database
         os.system("sudo -u postgres initdb -D /data")
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 44452e36..150c70a3 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -175,3 +175,9 @@ DB_HOST={{ db_url }}
 DB_NAME={{ db_name }}
 {% endif %}
 
+{% if (postgresql == 'external' or db_flavor == 'mysql') and webmail_type == 'roundcube' %}
+ROUNDCUBE_DB_USER={{ roundcube_db_user }}
+ROUNDCUBE_DB_PW={{ roundcube_db_pw }}
+ROUNDCUBE_DB_HOST={{ roundcube_db_url }}
+ROUNDCUBE_DB_NAME={{ roundcube_db_name }}
+{% endif %}
diff --git a/setup/static/render.js b/setup/static/render.js
index a817c4f0..0a0a6675 100644
--- a/setup/static/render.js
+++ b/setup/static/render.js
@@ -57,6 +57,13 @@ $(document).ready(function() {
 			$("#db_pw").prop('required',true);
 			$("#db_url").prop('required',true);
 			$("#db_name").prop('required',true);
+			if ($("#webmail").val() == 'roundcube') {
+				$("#roundcube_external_db").show();
+				$("#roundcube_db_user").prop('required',true);
+				$("#roundcube_db_pw").prop('required',true);
+				$("#roundcube_db_url").prop('required',true);
+				$("#roundcube_db_name").prop('required',true);
+			}
 		} else if (this.value == 'mysql') {
 			$("#postgres_db").hide();
 			$("#external_db").show();
@@ -64,6 +71,13 @@ $(document).ready(function() {
 			$("#db_pw").prop('required',true);
 			$("#db_url").prop('required',true);
 			$("#db_name").prop('required',true);
+			if ($("#webmail").val() == 'roundcube') {
+				$("#roundcube_external_db").show();
+				$("#roundcube_db_user").prop('required',true);
+				$("#roundcube_db_pw").prop('required',true);
+				$("#roundcube_db_url").prop('required',true);
+				$("#roundcube_db_name").prop('required',true);
+			}
 		}
 	});
 	$("#external_psql").change(function() {
@@ -73,6 +87,13 @@ $(document).ready(function() {
 			$("#db_pw").prop('required',true);
 			$("#db_url").prop('required',true);
 			$("#db_name").prop('required',true);
+			if ($("#webmail").val() == 'roundcube') {
+				$("#roundcube_external_db").show();
+				$("#roundcube_db_user").prop('required',true);
+				$("#roundcube_db_pw").prop('required',true);
+				$("#roundcube_db_url").prop('required',true);
+				$("#roundcube_db_name").prop('required',true);
+			}
 		} else {
 			$("#external_db").hide();
 		}
diff --git a/setup/templates/steps/database.html b/setup/templates/steps/database.html
index ad5411ab..d7184110 100644
--- a/setup/templates/steps/database.html
+++ b/setup/templates/steps/database.html
@@ -28,7 +28,7 @@
 		<br/>
 	</div>
 	<div class="form-group" id="external_db" style="display: none">
-		<p>Set external database parameters</p>
+		<p>Set external database parameters for <b>ADMIN UI</b></p>
 		<label>DB User</label>
 		<input class="form-control" type="text" name="db_user" placeholder="Username" id="db_user">
 		<label>Db Password</label>
@@ -37,6 +37,18 @@
 		<input class="form-control" type="text" name="db_url" placeholder="URL" id="db_url">
 		<label>Db Name</label>
 		<input class="form-control" type="text" name="db_name" placeholder="Database Name" id="db_name">
+		<br/>
+		<div class="form-group" id="roundcube_external_db" style="display: none">
+			<p>Set external database parameters for <b>Roundcube</b></p>
+			<label>DB User</label>
+			<input class="form-control" type="text" name="roundcube_db_user" placeholder="Username" id="roundcube_db_user">
+			<label>Db Password</label>
+			<input class="form-control" type="password" name="roundcube_db_pw" placeholder="Password" id="roundcube_db_pw">
+			<label>Db URL</label>
+			<input class="form-control" type="text" name="roundcube_db_url" placeholder="URL" id="roundcube_db_url">
+			<label>Db Name</label>
+			<input class="form-control" type="text" name="roundcube_db_name" placeholder="Database Name" id="roundcube_db_name">
+		</div>
 	</div>
 </div>