diff --git a/app/models/article.rb b/app/models/article.rb
index 1a615ea..d1a0d99 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -631,16 +631,18 @@ class Article < ActiveRecord::Base
   end
 
   def author_name(version_number = nil)
-    person = version_number ? author(version_number) : author
+    person = author(version_number)
     person ? person.name : (setting[:author_name] || _('Unknown'))
   end
 
-  def author_url
-    author ? author.url : nil
+  def author_url(version_number = nil)
+    person = author(version_number)
+    person ? person.url : nil
   end
 
-  def author_id
-    author ? author.id : nil
+  def author_id(version_number = nil)
+    person = author(version_number)
+    person ? person.id : nil
   end
 
   def version_license(version_number = nil)
diff --git a/app/views/content_viewer/article_versions.rhtml b/app/views/content_viewer/article_versions.rhtml
index c3f2a80..4699ad3 100644
--- a/app/views/content_viewer/article_versions.rhtml
+++ b/app/views/content_viewer/article_versions.rhtml
@@ -14,7 +14,7 @@
         <%= radio_button_tag 'v2', v.version, false, :onclick => 'versionInputClicked(this)' %>
         <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
         <%= @page.version == v.version ? _('(current)') : '' %>
-        <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url)} %></span>
+        <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url(v.version))} %></span>
         <span class='updated-on'><%= show_time(v.updated_at) %></span>
       </li>
     <% end %>
--
libgit2 0.21.2