diff --git a/modules/user/views_handler_field_user_picture.inc b/modules/user/views_handler_field_user_picture.inc
index cdfa7f2..849d3d7 100644
--- a/modules/user/views_handler_field_user_picture.inc
+++ b/modules/user/views_handler_field_user_picture.inc
@@ -9,21 +9,45 @@ class views_handler_field_user_picture extends views_handler_field {
     parent::construct();
     $this->additional_fields['uid'] = 'uid';
     $this->additional_fields['name'] = 'name';
-    $this->additional_fields['mail'] = 'mail';   
+    $this->additional_fields['mail'] = 'mail';
   }
 
   function element_type() {
     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 profile'),
+      '#type' => 'radios',
+      '#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 = $values->{$this->aliases['uid']};
+    if ($this->options['link_photo_to_profile']) {
+      // Prevent template_preprocess_user_picture from adding a link by unsetting the uid.
+      $account->uid = $values->{$this->aliases['uid']};
+    }
     $account->name = $values->{$this->aliases['name']};
     $account->mail = $values->{$this->aliases['mail']};
     $account->picture = $values->{$this->field_alias};
 
     return theme('user_picture', $account);
   }
+
 }