diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index c88ea52df..5545f4186 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -5,7 +5,7 @@ def destroy
     find_member
     toggle_active_posts
     @member.destroy
-    redirect_to users_path
+    redirect_to manage_users_path
   end
 
   def toggle_manager
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 42aa7abaf..ee0af5f60 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -61,7 +61,7 @@ def search_and_load_members(members_scope)
     @search = members_scope.ransack(search_params)
 
     @members =
-      @search.result.eager_load(:account, :user).page(params[:page]).per(25)
+      @search.result.eager_load(:account, :user).page(params[:page]).per(20)
 
     @member_view_models =
       @members.map { |m| MemberDecorator.new(m, self.class.helpers) }
diff --git a/app/views/users/_member_card.html.erb b/app/views/users/_member_card.html.erb
index e750c9dfd..c6ed0c62c 100644
--- a/app/views/users/_member_card.html.erb
+++ b/app/views/users/_member_card.html.erb
@@ -1,34 +1,36 @@
-<div class="to-member-card">
-  <div class="to-member-card__header">
-    <div class="to-member-card__header__avatar"><%= member.avatar_img(48) %></div>
-    <div class="to-member-card__header__text">
-      <h4><%= member.link_to_self %></h4>
-      <div class="to-member-card__header__text__activity">
-        <%= "##{member.member_uid} — " %>
-        <% if member.last_sign_in_at %>
-          <%= t('.active_ago', time: distance_of_time_in_words(Time.now, member.last_sign_in_at)) %>
-        <% else %>
-          <%= t('.no_activity') %>
-        <% end %>
+<div class="col-lg-6 col-sm-12">
+  <div class="to-member-card">
+    <div class="to-member-card__header">
+      <div class="to-member-card__header__avatar"><%= member.avatar_img(48) %></div>
+      <div class="to-member-card__header__text">
+        <h4><%= member.link_to_self %></h4>
+        <div class="to-member-card__header__text__activity">
+          <%= "##{member.member_uid} — " %>
+          <% if member.last_sign_in_at %>
+            <%= t('.active_ago', time: distance_of_time_in_words(Time.now, member.last_sign_in_at)) %>
+          <% else %>
+            <%= t('.no_activity') %>
+          <% end %>
+        </div>
       </div>
     </div>
-  </div>
-  <div class="to-member-card__body">
-    <div class="to-member-card__body__description">
-      <%= member.description %>
-    </div>
-    <div class="to-member-card__body__items">
-      <div class="to-member-card__body__item">
-        <span class="glyphicon glyphicon-earphone"></span>
-        <%= phone_to member.phone %>
-      </div>
-      <div class="to-member-card__body__item">
-        <span class="glyphicon glyphicon-envelope"></span>
-        <%= member.mail_to %>
+    <div class="to-member-card__body">
+      <div class="to-member-card__body__description">
+        <%= member.description %>
       </div>
-      <div class="to-member-card__body__item">
-        <%= "Balance: " %>
-        <%= member.account_balance %>
+      <div class="to-member-card__body__items">
+        <div class="to-member-card__body__item">
+          <span class="glyphicon glyphicon-earphone"></span>
+          <%= phone_to member.phone %>
+        </div>
+        <div class="to-member-card__body__item">
+          <span class="glyphicon glyphicon-envelope"></span>
+          <%= member.mail_to %>
+        </div>
+        <div class="to-member-card__body__item">
+          <%= "Balance: " %>
+          <%= member.account_balance %>
+        </div>
       </div>
     </div>
   </div>
diff --git a/app/views/users/_user_row.html.erb b/app/views/users/_user_row.html.erb
new file mode 100644
index 000000000..29af9c8d2
--- /dev/null
+++ b/app/views/users/_user_row.html.erb
@@ -0,0 +1,22 @@
+<%= content_tag(:tr, class: member.row_css_class) do %>
+  <td> <%= member.avatar_img %> </td>
+  <td> <%= member.member_uid %> </td>
+  <td>
+    <%= member.inactive_icon %>
+    <%= member.link_to_self %>
+  </td>
+  <td class="hidden-xs"> <%= member.mail_to %> </td>
+  <td class="hidden-xs hidden-sm"> <%= phone_to member.phone %> </td>
+  <td class="hidden-xs hidden-sm"> <%= member.account_balance %> </td>
+  <% if current_user.manages?(current_organization) %>
+    <td class="hover-actions hidden-xs hidden-sm">
+      <% if member.active? %>
+        <%= render 'toggle_manager_link', member: member if can_toggle_manager?(member) %>
+      <% else %>
+        <%= render 'cancel_membership_link', member: member if can_cancel_member?(member) %>
+      <% end %>
+
+      <%= render 'toggle_active_link', member: member if can_toggle_active?(member) %>
+    </td>
+  <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_rows.html.erb b/app/views/users/_user_rows.html.erb
deleted file mode 100644
index e34632d1d..000000000
--- a/app/views/users/_user_rows.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% members.each do |member| %>
-  <%= content_tag(:tr, class: member.row_css_class) do %>
-    <td> <%= member.avatar_img %> </td>
-    <td> <%= member.member_uid %> </td>
-    <td>
-      <%= member.inactive_icon %>
-      <%= member.link_to_self %>
-    </td>
-    <td class="hidden-xs"> <%= member.mail_to %> </td>
-    <td class="hidden-xs hidden-sm"> <%= phone_to member.phone %> </td>
-    <td class="hidden-xs hidden-sm"> <%= member.account_balance %> </td>
-    <% if current_user.manages?(current_organization) %>
-      <td class="hover-actions hidden-xs hidden-sm">
-        <% if member.active? %>
-          <%= render 'toggle_manager_link', member: member if can_toggle_manager?(member) %>
-        <% else %>
-          <%= render 'cancel_membership_link', member: member if can_cancel_member?(member) %>
-        <% end %>
-
-        <%= render 'toggle_active_link', member: member if can_toggle_active?(member) %>
-      </td>
-    <% end %>
-  <% end %>
-<% end %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 8cde20cd7..3d901a9dd 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -32,11 +32,7 @@
   </div>
 
   <div class="row to-member-cards">
-    <% @member_view_models.each do |member| %>
-      <div class="col-lg-6 col-sm-12">
-        <%= render 'member_card', member: member %>
-      </div>
-    <% end %>
+    <%= render partial: 'member_card', collection: @member_view_models, as: :member %>
   </div>
 
   <div class="row">
diff --git a/app/views/users/manage.html.erb b/app/views/users/manage.html.erb
index 9c0cee757..a02f58d4f 100644
--- a/app/views/users/manage.html.erb
+++ b/app/views/users/manage.html.erb
@@ -68,7 +68,7 @@
             </tr>
           </thead>
           <tbody>
-            <%= render "user_rows", members: @member_view_models %>
+            <%= render partial: "user_row", collection: @member_view_models, as: :member %>
           </tbody>
         </table>