diff --git a/application/controllers/Attributes.php b/application/controllers/Attributes.php
index 394ccd8b9..ee2fd3e90 100644
--- a/application/controllers/Attributes.php
+++ b/application/controllers/Attributes.php
@@ -58,6 +58,7 @@ class Attributes extends Secure_Controller
 
 	public function save_definition($definition_id = -1)
 	{
+
 		$definition_flags = 0;
 
 		$flags = (empty($this->input->post('definition_flags'))) ? array() : $this->input->post('definition_flags');
@@ -71,10 +72,14 @@ class Attributes extends Secure_Controller
 		$definition_data = array(
 			'definition_name' => $this->input->post('definition_name'),
 			'definition_flags' => $definition_flags,
-			'definition_type' => DEFINITION_TYPES[$this->input->post('definition_type')],
 			'definition_fk' => $this->input->post('definition_group') != '' ? $this->input->post('definition_group') : NULL
 		);
 
+		if ($this->input->post('definition_type') != null)
+		{
+			$definition_data['definition_type'] = DEFINITION_TYPES[$this->input->post('definition_type')];
+		}
+
 		$definition_name = $this->xss_clean($definition_data['definition_name']);
 
 		if($this->Attribute->save_definition($definition_data, $definition_id))
diff --git a/application/views/attributes/form.php b/application/views/attributes/form.php
index e092d3143..d41655c31 100644
--- a/application/views/attributes/form.php
+++ b/application/views/attributes/form.php
@@ -156,7 +156,6 @@ $(document).ready(function()
 		{
 			$(form).ajaxSubmit({
 				beforeSerialize: function($form, options) {
-				    $("select").removeAttr('disabled');
 					is_new && $('<input>').attr({
 						id: 'definition_values',
 						type: 'hidden',