diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index f86411e6a..40d63498c 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -11,7 +11,7 @@ class PublicsController < ApplicationController
   end
 
   def webfinger
-    @user = Person.first(:email => params[:q])
+    @user = Person.first(:email => params[:q][4...].gsub('acct:', '')]
     render 'webfinger', :layout => false, :content_type => 'application/xrd+xml'
   end
   
diff --git a/app/views/publics/host_meta.erb b/app/views/publics/host_meta.erb
index 88ea0ffd7..ad8a3671c 100644
--- a/app/views/publics/host_meta.erb
+++ b/app/views/publics/host_meta.erb
@@ -3,7 +3,7 @@
      xmlns:hm='http://host-meta.net/xrd/1.0'>
   <hm:Host xmlns='http://host-meta.net/xrd/1.0'><%=@user.url%></hm:Host>
   <Link rel='lrdd' 
-        template='<%=@user.url%>webfinger/?q={uri}'>
+        template='<%=@user.url%>webfinger/tom'>
     <Title>Resource Descriptor</Title>
   </Link>
-</XRD>
\ No newline at end of file
+</XRD>