diff --git a/admin/templates/default/config.xet b/admin/templates/default/config.xet
index 56cd6bdbff..b510368292 100644
--- a/admin/templates/default/config.xet
+++ b/admin/templates/default/config.xet
@@ -5,14 +5,18 @@
 	<template id="admin.config" template="" lang="" group="0" version="18.1">
 		<tabbox id="tabs" width="100%">
 			<tabs>
-				<tab id="config" label="Configuration"/>
+				<tab id="general" label="General"/>
+				<tab id="appearance" label="Appearance"/>
+				<tab id="secrurity" label="Security"/>
 			</tabs>
 			<tabpanels>
-				<template id="admin.config.config"/>
+				<template id="admin.config.general"/>
+				<template id="admin.config.appearance"/>
+				<template id="admin.config.security"/>
 			</tabpanels>
 		</tabbox>
 	</template>
-	<template id="admin.config.config" template="" lang="" group="0" version="16.1">
+	<template id="admin.config.general" template="" lang="" group="0" version="18.1">
 		<grid width="100%" class="admin-config egwGridView_grid">
 			<columns>
 				<column width="70%"/>
@@ -57,9 +61,16 @@
 						<option value="True">Yes</option>
 					</select>
 				</row>
-				<row>
-					<description value="appearance" span="all" class="subHeader"/>
-				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="admin.config.appearance" template="" lang="" group="0" version="18.1">
+		<grid width="100%" class="admin-config egwGridView_grid">
+			<columns>
+				<column width="70%"/>
+				<column/>
+			</columns>
+			<rows>
 				<row>
 					<description value="Enter the title for your site" label="%s:"/>
 					<textbox id="newsettings[site_title]"/>
@@ -131,9 +142,16 @@
 					<description value="Applications available on mobile devices" label="%s:"/>
 					<select-app id="newsettings[fw_mobile_app_list]" multiple="true" tags="true" other=",enabled:home;groupdav;sitemgr-link;sitemgr;developer_tools;etemplate;stylite;archive;importexport;activesync;notifications;esyncpro;preferences;registration" width="100%"/>
 				</row>
-				<row>
-					<description value="security" span="all" class="subHeader"/>
-				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="admin.config.security" template="" lang="" group="0" version="18.1">
+		<grid width="100%" class="admin-config egwGridView_grid">
+			<columns>
+				<column width="70%"/>
+				<column/>
+			</columns>
+			<rows>
 				<row>
 					<description value="Cookie path (allows multiple eGW sessions with different directories, has problemes with SiteMgr!)" label="%s:"/>
 					<select id="newsettings[cookiepath]">
diff --git a/admin/templates/default/site-config.xet b/admin/templates/default/site-config.xet
index 4e8943ee9c..eb1bffddd2 100644
--- a/admin/templates/default/site-config.xet
+++ b/admin/templates/default/site-config.xet
@@ -4,7 +4,14 @@
 <overlay>
 	<template id="admin.site-config" template="" lang="" group="0" version="16.1">
 		<description value="Site configuration" class="subHeader"/>
-		<template template="@template" width="100%"/>
+		<tabbox id="tabs2" width="100%">
+			<tabs>
+				<tab id="config" label="Configuration"/>
+			</tabs>
+			<tabpanels>
+				<template template="@template" width="99%"/>
+			</tabpanels>
+		</tabbox>
 		<hbox class="dialogFooterToolbar">
 			<button id="save" label="Save"/>
 			<button id="apply" label="Apply"/>