diff --git a/app/models/activity_streams/photo.rb b/app/models/activity_streams/photo.rb
index ace74a18c565c89284d76faa6b33e255bd0b724c..8fd6916560411cd282db72e9dbda38436369c125 100644
--- a/app/models/activity_streams/photo.rb
+++ b/app/models/activity_streams/photo.rb
@@ -32,5 +32,7 @@ class ActivityStreams::Photo < Post
       :actor_url => json["actor"]["url"]
     )
   end
+
+  def activity_streams?; true; end
 end
 
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 8fb22f7ba71681df791dac551237e7a949166384..6f074b1f0624877e91a49beeabe293ec0a5125a9 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -23,7 +23,7 @@
         = person_link(post.author, :class => 'author')
         %time.time.timeago{:datetime => post.created_at, :integer => time_for_sort(post).to_i}
 
-      - if post.model.instance_of?(ActivityStreams::Photo)
+      - if post.respond_to?(:activity_streams?)
         = image_tag post.image_url
       - else
         = render 'status_messages/status_message', :post => post, :photos => post.photos
diff --git a/app/views/shared/_stream_element.mobile.haml b/app/views/shared/_stream_element.mobile.haml
index d711643cfb2daf0e3a51910db416f3666a36c8dd..54f9e6ab7b2ca2f25f3e216ab82b3fa2b0c7122e 100644
--- a/app/views/shared/_stream_element.mobile.haml
+++ b/app/views/shared/_stream_element.mobile.haml
@@ -9,7 +9,7 @@
     .from
       = person_link(post.author)
 
-    - if post.model.instance_of?(ActivityStreams::Photo)
+    - if post.respond_to?(:activity_streams?)
       = image_tag post.image_url
     - else
       = render 'status_messages/status_message', :post => post, :photos => post.photos
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index ade63a1a8b63b6b6af3ad334a77a72741a7ba4ce..160e438dd01a8d848cde83992c4af5a5b100287a 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -140,6 +140,10 @@ describe UsersController do
   end
 
   describe '#generate_new_token' do
+    before do
+      AppConfig[:admins] = [@user.username]
+    end
+
     it 'generates a new token for the current user' do
       lambda { 
         get 'generate_new_token'