diff --git a/views/imagecache_profiles_handler_field_user_picture.inc b/views/imagecache_profiles_handler_field_user_picture.inc
index 5b7bc04..be1dc2b 100644
--- a/views/imagecache_profiles_handler_field_user_picture.inc
+++ b/views/imagecache_profiles_handler_field_user_picture.inc
@@ -7,6 +7,9 @@ class imagecache_profiles_handler_field_user_picture extends views_handler_field
       'default' => variable_get('user_picture_imagecache_profiles_default', ''),
       'translatable' => FALSE
     );
+    $options['link_photo_to_profile'] = array(
+      'default' => variable_get('link_photo_to_profile', TRUE),
+    );
     return $options;
   }
 
@@ -24,13 +27,23 @@ class imagecache_profiles_handler_field_user_picture extends views_handler_field
       '#options' => $opt,
       '#default_value' => $options['imagecache_preset'],
     );
+    $form['link_photo_to_profile'] = array(
+      '#title' => t("Link to user's profile"),
+      '#description' => t("Link the use picture to the user's profile"),
+      '#type' => 'checkbox',
+      '#default_value' => $options['link_photo_to_profile'],
+    );
   }
 
   function render($values) {
     // Fake an account object.
     $options = $this->options;
     $account = new stdClass();
-    $account->uid = $values->{$this->aliases['uid']};
+
+    if ($options['link_photo_to_profile']) {
+      $account->uid = $values->{$this->aliases['uid']};
+    }
+    
     $account->name = $values->{$this->aliases['name']};
     $account->mail = isset($values->{$this->aliases['mail']}) ? $values->{$this->aliases['mail']} : '';
     $account->picture = $values->{$this->field_alias};
@@ -42,3 +55,4 @@ class imagecache_profiles_handler_field_user_picture extends views_handler_field
     return theme('user_picture', $account);
   }
 }
+