diff --git a/plugins/content_types/user_context/user_picture.inc b/plugins/content_types/user_context/user_picture.inc
index dbe4242..f8a9e8a 100644
--- a/plugins/content_types/user_context/user_picture.inc
+++ b/plugins/content_types/user_context/user_picture.inc
@@ -14,14 +14,21 @@ $plugin = array(
 );
 
 function ctools_user_picture_content_type_render($subtype, $conf, $panel_args, $context) {
-  $account = isset($context->data) ? clone($context->data) : FALSE;
-  $block = new stdClass();
-  $block->module = 'term-list';
+  global $user;
 
-  if ($account === FALSE || ($account->access == 0 && !user_access('administer users'))) {
-    return drupal_not_found();
+  if (empty($context->data)) {
+    return;
   }
 
+  $account = clone $context->data;
+
+  // Check if user has permissions to access the user
+  if ($user->uid != $account->uid && (!user_access('access user profiles') && !user_access('administer users'))) {
+    return;
+  }
+
+  $block = new stdClass();
+  $block->module = 'user-profile';
   $block->title = check_plain($account->name);
   $block->content = theme('user_picture', array('account' => $account));