diff --git a/setup/index.php b/setup/index.php
index d43c9ab095..60579fc66c 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -179,6 +179,10 @@
 			$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to x',$setup_info['phpgwapi']['version']));
 			$setup_tpl->set_var('backupwarn',lang('backupwarn'));
 			$setup_tpl->set_var('upgrade',lang('Upgrade'));
+			$setup_tpl->set_var('goto',lang('Go to'));
+			$setup_tpl->set_var('configuration',lang('configuration'));
+			$setup_tpl->set_var('applications',lang('Manage Applications'));
+			$setup_tpl->set_var('language_management',lang('Manage Languages'));
 			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
 			$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
 			$setup_tpl->set_var('dropwarn',lang('Your tables may be altered and you may lose data'));
diff --git a/setup/templates/default/setup_db_blocks.tpl b/setup/templates/default/setup_db_blocks.tpl
index da2c3e20d7..120c72b6ca 100644
--- a/setup/templates/default/setup_db_blocks.tpl
+++ b/setup/templates/default/setup_db_blocks.tpl
@@ -83,10 +83,19 @@
 		<input type="hidden" name="action" value="Uninstall all applications">
 		<input type="submit" name="label" value="{uninstall_all_applications}"><br>({dropwarn})
 		</form>
-
+		<hr>
+{dont_touch_my_data}.&nbsp;&nbsp;{goto}:
 		<form method="POST" action="config.php">
         <input type="hidden" name="action" value="Dont touch my data">
-		<input type="submit" name="label" value="{dont_touch_my_data}">
+		<input type="submit" name="label" value="{configuration}">
+        </form>
+		<form method="POST" action="lang.php">
+        <input type="hidden" name="action" value="Dont touch my data">
+		<input type="submit" name="label" value="{language_management}">
+        </form>
+		<form method="POST" action="applications.php">
+        <input type="hidden" name="action" value="Dont touch my data">
+		<input type="submit" name="label" value="{applications}">
 		</form>
 	</td>
 </tr>