diff --git a/modules/user/views_handler_field_user_picture.inc b/modules/user/views_handler_field_user_picture.inc
index 62fd05a..b3aad77 100644
--- a/modules/user/views_handler_field_user_picture.inc
+++ b/modules/user/views_handler_field_user_picture.inc
@@ -19,10 +20,33 @@ class views_handler_field_user_picture extends views_handler_field {
     return 'div';
   }
 
+  function option_definition() {
+    $options = parent::option_definition();
+    $options['link_photo_to_profile'] = array('default' => 1);
+    return $options;
+  }
+
+  function options_form(&$form, &$form_state) {
+    parent::options_form($form, $form_state);
+    $form['link_photo_to_profile'] = array(
+      '#title' => t('Link to user\'s its profile'),
+      '#description' => 'Check this box to en-/disable the link on a user-picture to the users profile',
+      '#type' => 'checkbox',
+      '#options' => array(
+        1 => t('Yes'),
+        0 => t('No'),
+      ),
+      '#default_value' => $this->options['link_photo_to_profile'],
+    );
+  }
+
   function render($values) {
     // Fake an account object.
     $account = new stdClass();
-    $account->uid = $this->get_value($values, 'uid');
+    if ($this->options['link_photo_to_profile']) {
+      // Prevent template_preprocess_user_picture from adding a link by unsetting the uid.
+      $account->uid = $this->get_value($values, 'uid');
+    }
     $account->name = $this->get_value($values, 'name');
     $account->mail = $this->get_value($values, 'mail');
     $account->picture = $this->get_value($values);