diff --git a/plugins/tasks/site_template.inc b/plugins/tasks/site_template.inc
index 5d7feb9..d56a102 100644
--- a/plugins/tasks/site_template.inc
+++ b/plugins/tasks/site_template.inc
@@ -88,13 +88,12 @@ function panels_everywhere_site_template_get_base_contexts($task, $subtask, $pla
       if ($form_context = ctools_context_get_form(array($node))) {
         $node = ctools_context_create_empty('node');
       }
-
       $account = _panels_everywhere_find_context($page['contexts'], 'user');
 
       // We're already including the logged in user. We don't want that to
       // accidentally show up as the user being viewed if we're doing
       // something unrelated and the logged in user was added as a context.
-      if (isset($account->data->logged_in_user)) {
+      if (isset($account->data->logged_in_user) || in_array('authenticated user', $account->data->roles)) {
         $account = ctools_context_create_empty('user');
       }