diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
index f052e8697..c47a8f2c0 100644
--- a/app/helpers/people_helper.rb
+++ b/app/helpers/people_helper.rb
@@ -52,19 +52,20 @@ module PeopleHelper
   end
 
   def person_href(person, opts={})
-    "href=\"#{local_or_remote_person_path(person, opts)}\""
+    "href=\"#{local_or_remote_person_path(person, opts)}\"".html_safe
   end
   
   
   # Rails.application.routes.url_helpers is needed since this is indirectly called from a model
   def local_or_remote_person_path(person, opts={})
     opts.merge!(:protocol => AppConfig[:pod_uri].scheme, :host => AppConfig[:pod_uri].authority)
+    absolute = opts.delete(:absolute)
     
     if person.local?
       username = person.diaspora_handle.split('@')[0]
       unless username.include?('.')
         opts.merge!(:username => username)
-        if opts[:absolute]
+        if absolute
           return Rails.application.routes.url_helpers.user_profile_url(opts)
         else
           return Rails.application.routes.url_helpers.user_profile_path(opts)
@@ -72,7 +73,7 @@ module PeopleHelper
       end
     end
     
-    if opts[:absolute]
+    if absolute
       return Rails.application.routes.url_helpers.person_url(person, opts)
     else
       return Rails.application.routes.url_helpers.person_path(person, opts)
diff --git a/app/views/publics/webfinger.erb b/app/views/publics/webfinger.erb
index c462a13fe..fd7a3b466 100644
--- a/app/views/publics/webfinger.erb
+++ b/app/views/publics/webfinger.erb
@@ -6,7 +6,7 @@
   <Link rel="http://joindiaspora.com/seed_location" type = 'text/html' href="<%=@person.url%>"/>
   <Link rel="http://joindiaspora.com/guid" type = 'text/html' href="<%=@person.guid%>"/>
 
-  <Link rel='http://webfinger.net/rel/profile-page' type='text/html' <%="#{person_href(@person, :absolute => true)}"%>/>
+  <Link rel='http://webfinger.net/rel/profile-page' type='text/html' <%=person_href(@person, :absolute => true)%>/>
   <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="<%=@person.public_url%>.atom"/>
 
   <Link rel="diaspora-public-key" type = 'RSA' href="<%=Base64.encode64s(@person.exported_key)%>"/>