diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e119c42017b5..e6cf58578791 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -77,7 +77,8 @@ function onContentLoad(){
   $('[data-table=inline]').not('.dataTable').dataTable(
       {
         "sDom": "<'row'<'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
-        "sPaginationType": "bootstrap"
+        "sPaginationType": "bootstrap",
+        "order": [[ 0, 'asc' ]] // Set default order for the first column
       }
   );
 
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index b8c862fac06a..f7f5ba75178c 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -316,10 +316,12 @@ table {
 
   .sorting_asc {
     background: url('sort_asc.png') no-repeat center right;
+    color: #0099d3;
   }
 
   .sorting_desc {
     background: url('sort_desc.png') no-repeat center right;
+    color: #0099d3;
   }
 
   .sorting_asc_disabled {
diff --git a/app/controllers/autosign_controller.rb b/app/controllers/autosign_controller.rb
index f6ccd3ed95c5..1a9199ec7db5 100644
--- a/app/controllers/autosign_controller.rb
+++ b/app/controllers/autosign_controller.rb
@@ -3,8 +3,7 @@ def index
     @proxy = SmartProxy.authorized(:view_smart_proxies_autosign).find(params[:smart_proxy_id])
     setup_proxy
 
-    autosign = @api.autosign
-    @autosign = autosign.paginate :page => params[:page], :per_page => Setting::General.entries_per_page
+    @autosign = @api.autosign
   end
 
   def new
diff --git a/app/controllers/puppetca_controller.rb b/app/controllers/puppetca_controller.rb
index df8919518ef8..b94debae6ad5 100644
--- a/app/controllers/puppetca_controller.rb
+++ b/app/controllers/puppetca_controller.rb
@@ -3,8 +3,7 @@ def index
     @proxy = find_proxy
     # expire cache if forced
     Rails.cache.delete("ca_#{@proxy.id}") if params[:expire_cache] == "true"
-    certs = find_certs
-    @certificates = certs.sort.paginate :page => params[:page], :per_page => Setting::General.entries_per_page
+    @certificates = SmartProxies::PuppetCA.all(@proxy)
   end
 
   def update
@@ -33,15 +32,4 @@ def destroy
   def find_proxy(permission = :view_smart_proxies_puppetca)
     SmartProxy.authorized(permission).find(params[:smart_proxy_id])
   end
-
-  def find_certs
-    if params[:state].blank?
-      SmartProxies::PuppetCA.find_by_state(@proxy, "valid") +
-        SmartProxies::PuppetCA.find_by_state(@proxy, "pending")
-    elsif params[:state] == "all"
-      SmartProxies::PuppetCA.all @proxy
-    else
-      SmartProxies::PuppetCA.find_by_state @proxy, params[:state]
-    end
-  end
 end
diff --git a/app/views/autosign/index.html.erb b/app/views/autosign/index.html.erb
index 6dd010543ff3..294cd0a8e14c 100644
--- a/app/views/autosign/index.html.erb
+++ b/app/views/autosign/index.html.erb
@@ -1,7 +1,7 @@
 <% title _("Autosign entries for %s") % @proxy %>
 <% title_actions display_link_if_authorized(_("Certificates"), hash_for_smart_proxy_puppetca_index_path(:smart_proxy_id => @proxy).merge(:auth_object => @proxy, :permission => 'view_smart_proxies_puppetca')),
   autosign_form %>
-<table class='table table-bordered table-striped table-condensed'>
+<table class="table table-bordered table-striped table-condensed" data-table="inline">
   <thead>
     <tr>
       <th><%= _("Name") %></th>
@@ -20,4 +20,3 @@
     <% end %>
   </tbody>
 </table>
-<%= will_paginate_with_info @autosign %>
diff --git a/app/views/puppetca/index.html.erb b/app/views/puppetca/index.html.erb
index bf4e5453f2e7..d395b3c389fa 100644
--- a/app/views/puppetca/index.html.erb
+++ b/app/views/puppetca/index.html.erb
@@ -1,7 +1,6 @@
 <% title _("PuppetCA on %s") % @proxy.name %>
-<% search_bar _("Filter by state: %s") % state_filter %>
 <% title_actions display_link_if_authorized(_("Autosign Entries"), hash_for_smart_proxy_autosign_index_path(:smart_proxy_id => @proxy)) %>
-<table class='table table-bordered table-striped table-condensed'>
+<table class="table table-bordered table-striped table-condensed" data-table="inline">
   <thead>
     <tr>
       <th><%= _("Certificate Name") %></th>
@@ -35,4 +34,3 @@
     <% end %>
   </tbody>
 </table>
-<%= will_paginate_with_info @certificates %>