diff --git a/modules/profile.module b/modules/profile.module
index b97d9b09322c0dfa19082e8d06765e4e348bdf2d..7f5873d429ea8f4d0007a7b72561441dade80781 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -244,6 +244,12 @@ function profile_admin_add($type) {
     if ($error = profile_validate_form($data)) {
       drupal_set_message($error, 'error');
     }
+    else if (db_result(db_query("SELECT fid FROM {profile_fields} WHERE title = '%s'", $data['title']))) {
+      drupal_set_message(t('the specified title is already in use'), 'error');
+    }
+    else if (db_result(db_query("SELECT fid FROM {profile_fields} WHERE name = '%s'", $data['name']))) {
+      drupal_set_message(t('the specified name is already in use'), 'error');
+    }
     else {
       db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, overview, options, page) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s')", $data['title'], $data['name'], $data['explanation'], $data['category'], $type, $data['weight'], $data['required'], $data['overview'], $data['options'], $data['page']);
 
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index b97d9b09322c0dfa19082e8d06765e4e348bdf2d..7f5873d429ea8f4d0007a7b72561441dade80781 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -244,6 +244,12 @@ function profile_admin_add($type) {
     if ($error = profile_validate_form($data)) {
       drupal_set_message($error, 'error');
     }
+    else if (db_result(db_query("SELECT fid FROM {profile_fields} WHERE title = '%s'", $data['title']))) {
+      drupal_set_message(t('the specified title is already in use'), 'error');
+    }
+    else if (db_result(db_query("SELECT fid FROM {profile_fields} WHERE name = '%s'", $data['name']))) {
+      drupal_set_message(t('the specified name is already in use'), 'error');
+    }
     else {
       db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, overview, options, page) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s')", $data['title'], $data['name'], $data['explanation'], $data['category'], $type, $data['weight'], $data['required'], $data['overview'], $data['options'], $data['page']);