diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f56d16d8c..50435f6ea 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -23,13 +23,15 @@ class ApplicationController < ActionController::Base
   end
 
   def set_header_data
-    if user_signed_in? && request.format.html?
-      @aspect = nil
-      @object_aspect_ids = []
-      @notification_count = Notification.for(current_user, :unread =>true).count
-      @unread_message_count = ConversationVisibility.sum(:unread, :conditions => "person_id = #{current_user.person.id}")
+    if user_signed_in?
+      if request.format.html?
+        @aspect = nil
+        @object_aspect_ids = []
+        @notification_count = Notification.for(current_user, :unread =>true).count
+        @unread_message_count = ConversationVisibility.sum(:unread, :conditions => "person_id = #{current_user.person.id}")
+      end
+      @all_aspects = current_user.aspects
     end
-    @all_aspects = current_user.aspects
   end
 
   def count_requests