diff --git a/app/views/admin/valuators/index.html.erb b/app/views/admin/valuators/index.html.erb
index bcb723029..622d01307 100644
--- a/app/views/admin/valuators/index.html.erb
+++ b/app/views/admin/valuators/index.html.erb
@@ -2,39 +2,41 @@
 
 <%= render 'admin/shared/user_search', url: search_admin_valuators_path %>
 
-<% if @valuators.any? %>
-  <h3 class="margin"><%= page_entries_info @valuators %></h3>
+<div id="valuators">
+  <% if @valuators.any? %>
+    <h3 class="margin"><%= page_entries_info @valuators %></h3>
 
-  <table id="valuators">
-    <thead>
-      <th scope="col"><%= t("admin.valuators.index.name") %></th>
-      <th scope="col"><%= t("admin.valuators.index.email") %></th>
-      <th scope="col"><%= t("admin.valuators.index.description") %></th>
-    </thead>
-    <tbody>
-      <% @valuators.each do |valuator| %>
-        <tr>
-          <td>
-            <%= valuator.name %>
-          </td>
-          <td>
-            <%= valuator.email %>
-          </td>
-          <td>
-            <% if valuator.description.present? %>
-              <%= valuator.description %>
-            <% else %>
-              <%= t("admin.valuators.index.no_description") %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+    <table>
+      <thead>
+        <th scope="col"><%= t("admin.valuators.index.name") %></th>
+        <th scope="col"><%= t("admin.valuators.index.email") %></th>
+        <th scope="col"><%= t("admin.valuators.index.description") %></th>
+      </thead>
+      <tbody>
+        <% @valuators.each do |valuator| %>
+          <tr>
+            <td>
+              <%= valuator.name %>
+            </td>
+            <td>
+              <%= valuator.email %>
+            </td>
+            <td>
+              <% if valuator.description.present? %>
+                <%= valuator.description %>
+              <% else %>
+                <%= t("admin.valuators.index.no_description") %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
 
-  <%= paginate @valuators %>
-<% else %>
-  <div class="callout primary">
-    <%= t("admin.valuators.index.no_valuators") %>
-  </div>
-<% end %>
+    <%= paginate @valuators %>
+  <% else %>
+    <div class="callout primary">
+      <%= t("admin.valuators.index.no_valuators") %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/admin/valuators/search.html.erb b/app/views/admin/valuators/search.html.erb
index 4663a944b..9f5448c43 100644
--- a/app/views/admin/valuators/search.html.erb
+++ b/app/views/admin/valuators/search.html.erb
@@ -2,26 +2,41 @@
 
 <%= render 'admin/shared/user_search', url: search_admin_valuators_path %>
 
-<h3><%= page_entries_info @users %></h3>
+<div id="valuators">
+  <% if @users.any? %>
+    <h3 class="margin"><%= page_entries_info @users %></h3>
 
-<table id="valuators">
-  <% @users.each do |user| %>
-    <tr>
-      <td><%= user.name %></td>
-      <td><%= user.email %></td>
-      <td class="float-right">
-        <% if user.valuator? && user.valuator.description.present? %>
-          <%= user.valuator.description %>
-        <% else %>
-          <%= form_for Valuator.new(user: user), url: admin_valuators_path do |f| %>
-            <%= f.text_field :description,
-                             label: false,
-                             placeholder: t("admin.valuators.valuator.description_placeholder") %>
-            <%= f.hidden_field :user_id %>
-            <%= f.submit t("admin.valuators.valuator.add"), class: "button success float-left" %>
-          <% end %>
+    <table>
+      <thead>
+        <th scope="col"><%= t("admin.valuators.index.name") %></th>
+        <th scope="col"><%= t("admin.valuators.index.email") %></th>
+        <th scope="col"><%= t("admin.valuators.index.description") %></th>
+      </thead>
+      <tbody>
+        <% @users.each do |user| %>
+          <tr>
+            <td><%= user.name %></td>
+            <td><%= user.email %></td>
+            <td class="float-right">
+              <% if user.valuator? && user.valuator.description.present? %>
+                <%= user.valuator.description %>
+              <% else %>
+                <%= form_for Valuator.new(user: user), url: admin_valuators_path do |f| %>
+                  <%= f.text_field :description,
+                                   label: false,
+                                   placeholder: t("admin.valuators.valuator.description_placeholder") %>
+                  <%= f.hidden_field :user_id %>
+                  <%= f.submit t("admin.valuators.valuator.add"), class: "button success float-left" %>
+                <% end %>
+              <% end %>
+            </td>
+          </tr>
         <% end %>
-      </td>
-    </tr>
+      </tbody>
+    </table>
+  <% else %>
+    <div class="callout alert margin">
+      <%= t("admin.shared.no_search_results") %>
+    </div>
   <% end %>
-</table>
+</div>
diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb
index 86f2c89e9..bb631cbc3 100644
--- a/spec/features/admin/valuators_spec.rb
+++ b/spec/features/admin/valuators_spec.rb
@@ -47,7 +47,7 @@ feature 'Admin valuators' do
       click_button 'Search'
 
       expect(page).to have_content('Valuators: User search')
-      expect(page).to have_content('users cannot be found')
+      expect(page).to have_content('No results found')
       expect(page).to_not have_content(@valuator1.name)
       expect(page).to_not have_content(@valuator2.name)
     end