diff --git a/admin/inc/class.customfields.inc.php b/admin/inc/class.customfields.inc.php
index 875fe83932..17125a18d8 100644
--- a/admin/inc/class.customfields.inc.php
+++ b/admin/inc/class.customfields.inc.php
@@ -305,6 +305,10 @@ class customfields
 					break;
 				case 'save':
 				case 'apply':
+					if(empty($content['cf_label']))
+					{
+						$content['cf_label'] = $content['cf_name'];
+					}
 					if (!empty($content['cf_values']))
 					{
 						$values = array();
diff --git a/admin/js/app.js b/admin/js/app.js
index d581c68979..3e0c42fb0c 100644
--- a/admin/js/app.js
+++ b/admin/js/app.js
@@ -100,6 +100,11 @@ app.classes.admin = AppJS.extend(
 
 			case 'admin.categories.index':
 				break;
+			case 'admin.customfield_edit':
+				// Load settings appropriate to currently set type
+				var widget = _et2.widgetContainer.getWidgetById('cf_type');
+				this.cf_type_change(null,widget);
+				break;
 		}
 	},
 
@@ -784,5 +789,18 @@ app.classes.admin = AppJS.extend(
 			}
 		};
 		et2_dialog.show_dialog(delDialog_callBack,this.egw.lang("Are you sure you want to delete this category ?"),this.egw.lang("Delete"),{},_buttons,et2_dialog.WARNING_MESSAGE,null,'admin');
+	},
+
+	/**
+	 * Change handler for when you change the type of a custom field.
+	 * It toggles options / attributes as appropriate.
+	 */
+	cf_type_change: function(e,widget) {
+		var root = widget.getRoot();
+		var attributes = widget.getArrayMgr('content').getEntry('attributes['+widget.getValue()+']')||{};
+		root.getWidgetById('cf_values').set_statustext(widget.egw().lang(widget.getArrayMgr('content').getEntry('options['+widget.getValue()+']'))||'');
+		root.getWidgetById('cf_len').set_disabled(!attributes.cf_len);
+		root.getWidgetById('cf_rows').set_disabled(!attributes.cf_rows);
+		root.getWidgetById('cf_values').set_disabled(!attributes.cf_values);
 	}
 });
diff --git a/admin/templates/default/customfield_edit.xet b/admin/templates/default/customfield_edit.xet
index 52422d251d..d1fa8f654a 100644
--- a/admin/templates/default/customfield_edit.xet
+++ b/admin/templates/default/customfield_edit.xet
@@ -29,10 +29,7 @@
 				</row>
 				<row>
 					<description value="Type of field"/>
-					<customfields-types statustext="Type of customfield" id="cf_type" class="et2_fullWidth" span="2" onchange="widget.getRoot().getWidgetById('cf_values').set_statustext(widget.egw().lang(widget.getArrayMgr('content').getEntry('options['+widget.getValue()+']'))||'');
-widget.getRoot().getWidgetById('cf_len').set_disabled(!widget.getArrayMgr('content').getEntry('attributes['+widget.getValue()+'][cf_len]'));
-widget.getRoot().getWidgetById('cf_rows').set_disabled(!widget.getArrayMgr('content').getEntry('attributes['+widget.getValue()+'][cf_rows]'));
-widget.getRoot().getWidgetById('cf_values').set_disabled(!widget.getArrayMgr('content').getEntry('attributes['+widget.getValue()+'][cf_values]'));"/>
+					<customfields-types statustext="Type of customfield" id="cf_type" class="et2_fullWidth" span="2" onchange="app.admin.cf_type_change"/>
 					<hbox span="2">
 						<description value="Required"/>
 						<checkbox id="cf_needed"/>