diff --git a/app/controllers/paper_trail_manager/changes_controller.rb b/app/controllers/paper_trail_manager/changes_controller.rb
index 6458506..135fb0a 100644
--- a/app/controllers/paper_trail_manager/changes_controller.rb
+++ b/app/controllers/paper_trail_manager/changes_controller.rb
@@ -28,7 +28,7 @@ def index
       @page = nil if @page.zero?
 
       @per_page = params[:per_page].to_i
-      @per_page = nil if @per_page.zero?
+      @per_page = PER_PAGE if @per_page.zero?
 
       @versions = if defined?(WillPaginate)
                     @versions.paginate(page: @page, per_page: @per_page)
diff --git a/paper_trail_manager.gemspec b/paper_trail_manager.gemspec
index 616d656..b1f09db 100644
--- a/paper_trail_manager.gemspec
+++ b/paper_trail_manager.gemspec
@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'paper_trail_manager'
   spec.version       = '0.8.0'
   spec.authors       = ['Igal Koshevoy', 'Reid Beels']
-  spec.authors       = ['mail@reidbeels.com']
+  spec.email         = ['mail@reidbeels.com']
   spec.summary       = 'A user interface for `paper_trail` versioning data in Rails applications.'
   spec.description   = 'Browse, subscribe, view and revert changes to records when using Rails and the `paper_trail` gem.'
   spec.homepage      = 'https://github.com/DamageLabs/paper_trail_manager'