diff --git a/lib/salmon/salmon.rb b/lib/salmon/salmon.rb
index d1a4d7a1f..8b01fd787 100644
--- a/lib/salmon/salmon.rb
+++ b/lib/salmon/salmon.rb
@@ -82,7 +82,7 @@ module Salmon
     <entry xmlns='http://www.w3.org/2005/Atom'>
     <author>
       <name>#{@author.real_name}</name>
-      <uri>acct:#{@author.email}</uri>
+      <uri>acct:#{@author.owner.diaspora_handle}</uri>
     </author>
       #{@magic_sig.to_xml}
       </entry>
diff --git a/spec/lib/salmon_salmon_spec.rb b/spec/lib/salmon_salmon_spec.rb
index 4beb87866..63f7d5cb4 100644
--- a/spec/lib/salmon_salmon_spec.rb
+++ b/spec/lib/salmon_salmon_spec.rb
@@ -36,7 +36,7 @@ describe Salmon do
   end
 
   it 'should parse out the author email' do
-    @parsed_salmon.author_email.should == @user.person.email 
+    @parsed_salmon.author_email.should == @user.diaspora_handle
   end
 
   it 'should reference a local author' do