diff --git a/lib/gollum/frontend/views/page.rb b/lib/gollum/frontend/views/page.rb
index 401e8db8..2fe2ab0f 100644
--- a/lib/gollum/frontend/views/page.rb
+++ b/lib/gollum/frontend/views/page.rb
@@ -14,13 +14,13 @@ module Precious
       end
 
       def author
-        return DEFAULT_AUTHOR if @page.versions.empty?
-        @page.versions[0].author.name
+        return DEFAULT_AUTHOR unless @page.version
+        @page.version.author.name
       end
 
       def date
-        return Time.now.strftime(DATE_FORMAT) if @page.versions.empty?
-        @page.versions[0].authored_date.strftime(DATE_FORMAT)
+        return Time.now.strftime(DATE_FORMAT) unless @page.version
+        @page.version.authored_date.strftime(DATE_FORMAT)
       end
 
       def editable
diff --git a/test/test_app.rb b/test/test_app.rb
index cba11929..f83f9922 100644
--- a/test/test_app.rb
+++ b/test/test_app.rb
@@ -15,23 +15,7 @@ context "Frontend" do
     FileUtils.rm_rf(@path)
   end
 
-  test "committer remains same if page didn't modified" do
-    @wiki.write_page('CC', :markdown, 'asdf', 
-                     { :name => "asdf", :email => "news@nomail.com" });
-
-    get '/CC'
-    assert_match /Last edited by <b>asdf/, last_response.body
-
-    @wiki.write_page('DD', :markdown, 'asdf', 
-                     { :name => "news", :email => "asdf@nomail.com" });
-
-    get '/DD'
-    assert_match /Last edited by <b>news/, last_response.body
-    get '/CC'
-    assert_match /Last edited by <b>asdf/, last_response.body
-  end
-
-   test "edits page" do
+  test "edits page" do
     page_1 = @wiki.page('A')
     post "/edit/A", :content => 'abc',
       :format => page_1.format, :message => 'def'