diff --git a/plugins/validator/field_validation_unique_validator.inc b/plugins/validator/field_validation_unique_validator.inc
index e91dbdc..856f420 100644
--- a/plugins/validator/field_validation_unique_validator.inc
+++ b/plugins/validator/field_validation_unique_validator.inc
@@ -72,6 +72,12 @@ class field_validation_unique_validator extends field_validation_validator {
       // Store a copy of our matched entities for our use in tokens later.
       $matched_entities = $query->execute();
 
+      //Do the check per user
+      if (isset($this->rule->settings['per_user']) && $this->rule->settings['per_user'] && $scope != 'global') {
+        global $user;
+        $query->propertyCondition('uid', $user->uid);
+      }
+
       $count = $query
         ->count()
         ->execute();
@@ -135,6 +141,14 @@ class field_validation_unique_validator extends field_validation_validator {
       ),  
       '#default_value' => isset($default_settings['data']) ? $default_settings['data'] : '',
     );
+    $form['settings']['per_user'] = array(
+      '#title' => t('Per user'),
+      '#type' => 'checkbox', 
+      '#default_value' => isset($default_settings['per_user']) ? $default_settings['per_user'] : FALSE,
+      '#states' => array(
+        'invisible' => array(':input[name="settings[data]"]' => array('value' => 'global')),
+      ),
+    );
     parent::settings_form($form, $form_state);
   }
   
