diff --git a/application/controllers/Attributes.php b/application/controllers/Attributes.php
index ac07bb637..44f078e77 100644
--- a/application/controllers/Attributes.php
+++ b/application/controllers/Attributes.php
@@ -68,16 +68,10 @@ 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
 		);
 
-		$definition_type = empty($this->input->post('definition_type')) ? NULL : $this->input->post('definition_type');
-
-		if ($definition_type)
-		{
-			$definition_data['definition_type'] = DEFINITION_TYPES[$definition_type];
-		}
-
 		$definition_name = $this->xss_clean($definition_data['definition_name']);
 
 		if($this->Attribute->save_definition($definition_data, $definition_id))
diff --git a/application/models/Attribute.php b/application/models/Attribute.php
index c773a655f..21fe25cc4 100644
--- a/application/models/Attribute.php
+++ b/application/models/Attribute.php
@@ -160,6 +160,7 @@ class Attribute extends CI_Model
 	public function get_definition_names()
 	{
 		$this->db->from('attribute_definitions');
+		$this->db->where('deleted', 0);
 		$results = $this->db->get()->result_array();
 
 		$definition_name = array(-1 => $this->lang->line('common_none_selected_text'));
diff --git a/application/views/attributes/form.php b/application/views/attributes/form.php
index e1d4539b5..db7b0b68d 100644
--- a/application/views/attributes/form.php
+++ b/application/views/attributes/form.php
@@ -147,7 +147,7 @@
 			{
 				$(form).ajaxSubmit({
 					beforeSerialize: function($form, options) {
-
+					    $("select[disabled='disabled'").removeAttr("disabled");
 						is_new && $('<input>').attr({
 							id: 'definition_values',
 							type: 'hidden',
diff --git a/application/views/attributes/item.php b/application/views/attributes/item.php
index 2d9e71f63..e9b98519a 100644
--- a/application/views/attributes/item.php
+++ b/application/views/attributes/item.php
@@ -45,7 +45,7 @@ foreach($definition_values as $definition_id => $definition_value)
                 echo form_input("attribute_links[$definition_id]", $value, "class='form-control' data-definition-id='$definition_id'");
             }
             ?>
-            <span id="remove_attribute_link" class="input-group-addon input-sm btn btn-default"><span class="glyphicon glyphicon-trash"></span></span>
+            <span class="input-group-addon input-sm btn btn-default remove_attribute_btn"><span class="glyphicon glyphicon-trash"></span></span>
         </div>
     </div>
 </div>
@@ -58,11 +58,11 @@ foreach($definition_values as $definition_id => $definition_value)
     (function() {
         <?php $this->load->view('partial/datepicker_locale'); ?>
 
-        $(".datetime").datetimepicker(pickerconfig);
+        $(".datetime").datetimepicker(pickerconfig());
 
         var enable_delete = function() {
-            $("#remove_attribute_link").click(function() {
-                var parents = $(this).parents(".form-group").remove();
+            $(".remove_attribute_btn").click(function() {
+                $(this).parents(".form-group").remove();
             });
         };