diff --git a/app/views/publics/webfinger.erb b/app/views/publics/webfinger.erb
index 8c6d08657..c99d6c134 100644
--- a/app/views/publics/webfinger.erb
+++ b/app/views/publics/webfinger.erb
@@ -2,9 +2,9 @@
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
   <Subject>acct:<%=@person.diaspora_handle%></Subject>
   <Alias>"<%= @person.url %>"</Alias>
-  <Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%=@person.url%>hcard/users/<%=@person.id%>"/>
+  <Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%=@person.url%>hcard/users/<%=@person.guid%>"/>
   <Link rel="http://joindiaspora.com/seed_location" type = 'text/html' href="<%=@person.url%>"/>
-  <Link rel="http://joindiaspora.com/guid" type = 'text/html' href="<%=@person.id%>"/>
+  <Link rel="http://joindiaspora.com/guid" type = 'text/html' href="<%=@person.guid%>"/>
 
   <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="<%=@person.public_url%>.atom"/>
 
diff --git a/app/views/publics/webfinger.html.erb b/app/views/publics/webfinger.html.erb
index 8c6d08657..c99d6c134 100644
--- a/app/views/publics/webfinger.html.erb
+++ b/app/views/publics/webfinger.html.erb
@@ -2,9 +2,9 @@
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
   <Subject>acct:<%=@person.diaspora_handle%></Subject>
   <Alias>"<%= @person.url %>"</Alias>
-  <Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%=@person.url%>hcard/users/<%=@person.id%>"/>
+  <Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%=@person.url%>hcard/users/<%=@person.guid%>"/>
   <Link rel="http://joindiaspora.com/seed_location" type = 'text/html' href="<%=@person.url%>"/>
-  <Link rel="http://joindiaspora.com/guid" type = 'text/html' href="<%=@person.id%>"/>
+  <Link rel="http://joindiaspora.com/guid" type = 'text/html' href="<%=@person.guid%>"/>
 
   <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="<%=@person.public_url%>.atom"/>
 
diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb
index 4a9dfdc50..a94d02446 100644
--- a/spec/controllers/publics_controller_spec.rb
+++ b/spec/controllers/publics_controller_spec.rb
@@ -12,6 +12,13 @@ describe PublicsController do
     @person = Factory(:person)
   end
 
+  describe '#host_meta' do
+    it 'succeeds' do
+      get :host_meta
+      response.should be_success
+      response.body.should =~ /webfinger/
+    end
+  end
   describe '#receive' do
     let(:xml) { "<walruses></walruses>" }