diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index aaf8ecabf..411481f0e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -634,7 +634,8 @@ class ApplicationController < ActionController::Base
 	end
 
 	def paginate(relation)
-		limit  = (params[:limit].to_i.zero? || params[:limit].to_i > 20) ? 20 : params[:limit].to_i
+		limit = params[:limit] || params[:per_page]
+		limit  = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i
 		page   = params[:page].to_i.zero? ? 1 : params[:page].to_i
 		offset = (page - 1) * limit
 
@@ -645,6 +646,8 @@ class ApplicationController < ActionController::Base
 		end
 	end
 
+
+
 	def strf_time(time)
 		time.blank? ? '' : time.strftime("%Y-%m-%d %H:%M:%S")
 	end