diff --git a/sites/all/modules/author_taxonomy/author_taxonomy.module b/sites/all/modules/author_taxonomy/author_taxonomy.module
index a27ec70..05325be 100644
--- a/sites/all/modules/author_taxonomy/author_taxonomy.module
+++ b/sites/all/modules/author_taxonomy/author_taxonomy.module
@@ -377,7 +377,12 @@ function author_taxonomy_form_alter(&$form, $form_state, $form_id) {
   
     if ($taxonomy->tags == '1') {
       if (!$form['taxonomy']['tags'][$vid]['#default_value'] && variable_get('author_taxonomy_auto_add', FALSE)) {
-        $form['taxonomy']['tags'][$vid]['#default_value'] = $user->name;
+        $tid = db_result(db_query('SELECT tid FROM {author_taxonomy_term_link} WHERE uid = %d', $user->uid));
+        if($tid) {
+          $form['taxonomy']['tags'][$vid]['#default_value'] = taxonomy_get_term($tid)->name;
+        } else {
+          $form['taxonomy']['tags'][$vid]['#default_value'] = $user->name;
+        }
       }
     }
   }