diff --git a/pathauto.module b/pathauto.module
index 08f4ad3..6f5065d 100644
--- a/pathauto.module
+++ b/pathauto.module
@@ -525,11 +525,15 @@ function pathauto_user($op, &$edit, &$account, $category = NULL) {
         }
       }
 
-      pathauto_user_update_alias($merged_account, 'insert');
+      if (!isset($merged_account->pathauto_perform_alias) || !empty($merged_account->pathauto_perform_alias)) {
+        pathauto_user_update_alias($merged_account, 'insert');
+      }
       break;
 
     case 'after_update':
-      pathauto_user_update_alias($account, 'update');
+      if (!isset($account->pathauto_perform_alias) || !empty($account->pathauto_perform_alias)) {
+        pathauto_user_update_alias($account, 'update');
+      }
       break;
 
     case 'delete':