Index: content_profile.module
===================================================================
--- content_profile.module	(revision 47)
+++ content_profile.module	(working copy)
@@ -383,14 +383,13 @@
   }
   elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
     $form = $a3;
-    // Only validate if the user-name changed or we add a new node
-    if (!empty($node->nid) && $form['author']['name']['#default_value'] == $node->name) {
-      return;
-    }
-    //check whether the selected user has already a profile
-    $uid = db_result(db_query("SELECT uid FROM {users} WHERE name = '%s'", $node->name));
-    if (content_profile_profile_exists($node, $uid)) {
-      form_set_error('name', t('This user already has a content profile of this type. You can only create one profile per user.'));
+    // We must validate if we are adding a new node *or* the user-name is changed
+    if (empty($node->nid) || $form['author']['name']['#default_value'] == $node->name) {
+      //check whether the selected user has already a profile
+      $uid = db_result(db_query("SELECT uid FROM {users} WHERE name = '%s'", $node->name));
+      if (content_profile_profile_exists($node, $uid)) {
+        form_set_error('name', t('This user already has a content profile of this type. You can only create one profile per user.'));
+      }
     }
   }
   elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {