diff --git a/active_tags.module b/active_tags.module
index c5112e5..b3c2c3a 100644
--- a/active_tags.module
+++ b/active_tags.module
@@ -36,12 +36,21 @@ function active_tags_enable_widget($field_ids) {
  * Implementation of hook_form_alter.
  */
 function active_tags_form_alter(&$form, $form_state, $form_id) {
+	
+	// Taxonomy machine name support
+	if (module_exists('taxonomy_machine_names')) {
+		$voc = taxonomy_vocabulary_load($form['vid']['#value']);
+		$voc_id = $voc->machine_name;
+	} else {
+		$voc_id = $form['vid']['#value'];
+	}
+	
   if ($form_id === 'taxonomy_form_vocabulary') {
     $form['settings']['active_tags'] = array(
       '#type' => 'checkbox',
       '#title' => t('Active Tags'),
       '#weight' => 10,
-      '#default_value' => (isset($form['vid'])) ? variable_get('active_tags_'. $form['vid']['#value'], 0) : 0,
+			'#default_value' => (isset($voc_id)) ? variable_get('active_tags_'. $voc_id, 0) : 0,      
       '#description' => t('Swaps this vocabulary widget for an enhanced tag field if browser supports javascript.'),
     );
     $form['#submit'][] = 'active_tags_form_vocabulary_submit';
@@ -58,7 +67,16 @@ function active_tags_form_alter(&$form, $form_state, $form_id) {
 function active_tags_node_form_attach($form, $form_state) {
   $settings = array();
   foreach ($form['taxonomy']['tags'] as $id => $values) {
-    if (variable_get('active_tags_'. $id, 0) == 1) {
+
+		// Taxonomy machine name support
+		if (module_exists('taxonomy_machine_names')) {
+			$voc = taxonomy_vocabulary_load($id);
+			$voc_id = $voc->machine_name;
+		} else {
+			$voc_id = $form['vid']['#value'];
+		}
+
+    if (variable_get('active_tags_'. $voc_id, 0) == 1) {
       $settings[] = "#edit-taxonomy-tags-$id-wrapper";
     }
   }
@@ -73,6 +91,15 @@ function active_tags_node_form_attach($form, $form_state) {
  * Stores active_tags settings from taxonomy vocabulary form.
  */
 function active_tags_form_vocabulary_submit($form, &$form_state) {
-  variable_set('active_tags_'. $form_state['values']['vid'], $form_state['values']['active_tags']);
+
+	// Taxonomy machine name support
+	if (module_exists('taxonomy_machine_names')) {
+		$voc = taxonomy_vocabulary_load($form['vid']['#value']);
+		$voc_id = $voc->machine_name;
+	} else {
+		$voc_id = $form['vid']['#value'];
+	}
+
+  variable_set('active_tags_'. $voc_id, $form_state['values']['active_tags']);
   return TRUE;
 }