diff --git a/admin/inc/class.admin_customfields.inc.php b/admin/inc/class.admin_customfields.inc.php
index b05b0a477a..ae18b3705e 100644
--- a/admin/inc/class.admin_customfields.inc.php
+++ b/admin/inc/class.admin_customfields.inc.php
@@ -374,7 +374,7 @@ class admin_customfields
 							$update_content[substr($key,3)] = $value;
 						}
 					}
-					$cmd = new admin_cmd_customfield($this->appname, $update_content);
+					$cmd = new admin_cmd_customfield($this->appname, $update_content,null,$content['admin_cmd']);
 					$cmd->run();
 					if(!$cf_id)
 					{
diff --git a/admin/templates/default/customfield_edit.xet b/admin/templates/default/customfield_edit.xet
index 0386e8b44c..3adc30fa75 100644
--- a/admin/templates/default/customfield_edit.xet
+++ b/admin/templates/default/customfield_edit.xet
@@ -2,7 +2,7 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="admin.customfield_edit" template="" lang="" group="0" version="1.9.001">
+	<template id="admin.customfield_edit.settings" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
 			<columns>
 				<column width="100"/>
@@ -11,11 +11,6 @@
 				<column width="50"/>
 			</columns>
 			<rows>
-				<row class="dialogHeader" height="28">
-					<description statustext="the name used internaly (&amp;lt;= 20 chars), changeing it makes existing data unavailible" value="Name"/>
-					<textbox statustext="the name used internaly (&lt;= 20 chars), changeing it makes existing data unavailible" id="cf_name" size="20" maxlength="32" needed="true" class="et2_fullWidth" span="2"/>
-					<appicon/>
-				</row>
 				<row disabled="@no_types">
 					<description value="Type"/>
 					<menulist span="3">
@@ -53,8 +48,36 @@
 						<description value="Order"/>
 						<textbox type="integer" statustext="determines the order the fields are displayed" id="cf_order" min="1" size="4"/>
 					</box>
+
 					<description/>
 				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="admin.customfield_edit" template="" lang="" group="0" version="1.9.001">
+		<grid width="100%">
+			<columns>
+				<column width="100"/>
+				<column width="350"/>
+				<column width="45"/>
+				<column width="50"/>
+			</columns>
+			<rows>
+				<row class="dialogHeader" height="28">
+					<description statustext="the name used internaly (&amp;lt;= 20 chars), changeing it makes existing data unavailible" value="Name"/>
+					<textbox statustext="the name used internaly (&lt;= 20 chars), changeing it makes existing data unavailible" id="cf_name" size="20" maxlength="32" needed="true" class="et2_fullWidth" span="2"/>
+					<appicon/>
+				</row>
+				<row>
+					<tabbox id="tabs" class="et2_nowrap" span="all" width="100%" tab_height="400px">
+						<tabs>
+							<tab id="settings" label="Settings" statustext="Settings"/>
+						</tabs>
+						<tabpanels>
+							<template id="admin.customfield_edit.settings"/>
+						</tabpanels>
+					</tabbox>
+				</row>
 				<row class="dialogFooterToolbar">
 					<hbox span="2">
 						<button statustext="Saves this entry" label="Save" id="button[save]" image="save" background_image="1"/>