diff --git a/lib/gollum/frontend/views/page.rb b/lib/gollum/frontend/views/page.rb
index 953cdb10..ce8de23a 100644
--- a/lib/gollum/frontend/views/page.rb
+++ b/lib/gollum/frontend/views/page.rb
@@ -15,12 +15,12 @@ module Precious
 
       def author
         return DEFAULT_AUTHOR unless @page.version
-        @page.version.author.name
+        @page.versions.first.author.name
       end
 
       def date
         return Time.now.strftime(DATE_FORMAT) unless @page.version
-        @page.version.authored_date.strftime(DATE_FORMAT)
+        @page.versions.first.authored_date.strftime(DATE_FORMAT)
       end
 
       def editable
diff --git a/test/test_app.rb b/test/test_app.rb
index f83f9922..301c808d 100644
--- a/test/test_app.rb
+++ b/test/test_app.rb
@@ -15,6 +15,27 @@ context "Frontend" do
     FileUtils.rm_rf(@path)
   end
 
+  test "retain edit information" do
+    page1 = 'page1'
+    user1 = 'user1'
+    @wiki.write_page(page1, :markdown, '', 
+                     { :name => user1, :email => user1 });
+
+    get page1
+    assert_match /Last edited by <b>user1/, last_response.body
+
+    page2 = 'page2'
+    user2 = 'user2'
+    @wiki.write_page(page2, :markdown, '', 
+                     { :name => user2, :email => user2 });
+
+    get page2
+    assert_match /Last edited by <b>user2/, last_response.body
+
+    get page1
+    assert_match /Last edited by <b>user1/, last_response.body
+  end
+
   test "edits page" do
     page_1 = @wiki.page('A')
     post "/edit/A", :content => 'abc',