diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index e6506c55e..2b942541f 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -11,7 +11,6 @@ class PublicsController < ApplicationController
   end
 
   def host_meta
-    @user = User.owner
     render 'host_meta', :layout => false, :content_type => 'application/xrd+xml'
   end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d6913a9e5..7f6a7bae2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -32,7 +32,11 @@ module ApplicationHelper
   end
 
   def owner_image_tag
-    person_image_tag(User.owner)
+    person_image_tag(current_user)
+  end
+
+  def owner_image_link
+    person_image_link(current_user)
   end
 
   def person_image_tag(person)
@@ -46,10 +50,6 @@ module ApplicationHelper
     link_to person_image_tag(person), object_path(person)
   end
 
-  def owner_image_link
-    person_image_link(User.owner)
-  end
-
   def new_request(request_count)
     "new_requests" if request_count > 0
   end
diff --git a/app/models/blog.rb b/app/models/blog.rb
index 0df0dd558..3859cfa1e 100644
--- a/app/models/blog.rb
+++ b/app/models/blog.rb
@@ -15,8 +15,8 @@ class Blog < Post
   <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
   <title>#{self.title}</title>
   <content>#{self.body}</content>
-  <link rel="alternate" type="text/html" href="#{User.owner.url}blogs/#{self.id}"/>
-  <id>#{User.owner.url}blogs/#{self.id}</id>
+  <link rel="alternate" type="text/html" href="#{person.url}blogs/#{self.id}"/>
+  <id>#{person.url}blogs/#{self.id}</id>
   <published>#{self.created_at.xmlschema}</published>
   <updated>#{self.updated_at.xmlschema}</updated>
   </entry>
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index de1eb9258..677bfa126 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -17,9 +17,9 @@ class Bookmark < Post
   <entry>
   <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
   <title>#{self.title}</title>
-  <link rel="alternate" type="text/html" href="#{User.owner.url}bookmarks/#{self.id}"/>
+  <link rel="alternate" type="text/html" href="#{person.url}bookmarks/#{self.id}"/>
   <link rel="related" type="text/html" href="#{self.link}"/>
-  <id>#{User.owner.url}bookmarks/#{self.id}</id>
+  <id>#{person.url}bookmarks/#{self.id}</id>
   <published>#{self.created_at.xmlschema}</published>
   <updated>#{self.updated_at.xmlschema}</updated>
   </entry>
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index bf56410be..3fb9aa39d 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -13,8 +13,8 @@ class StatusMessage < Post
   <entry>
   <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
   <title>#{self.message}</title>
-  <link rel="alternate" type="text/html" href="#{User.owner.url}status_messages/#{self.id}"/>
-  <id>#{User.owner.url}status_messages/#{self.id}</id>
+  <link rel="alternate" type="text/html" href="#{person.url}status_messages/#{self.id}"/>
+  <id>#{person.url}status_messages/#{self.id}</id>
   <published>#{self.created_at.xmlschema}</published>
   <updated>#{self.updated_at.xmlschema}</updated>
   </entry>
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index f013e1583..a20ffb504 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -6,17 +6,6 @@ describe Post do
     @user.person.save
   end
 
-  describe 'defaults' do
-    before do
-      WebSocket.stub!(:update_clients)
-      @post = Factory.create(:post, :person => nil)
-    end
-
-    it "should associate the owner if none is present" do
-      @post.person.should == User.owner
-    end
-  end
-
   describe "newest" do
     before do
       @person_one = Factory.create(:person, :email => "some@dudes.com")