diff --git a/app/views/admin/users/_users.html.erb b/app/views/admin/users/_users.html.erb
index f3c6af0fa..2c4c4db2e 100644
--- a/app/views/admin/users/_users.html.erb
+++ b/app/views/admin/users/_users.html.erb
@@ -1,24 +1,32 @@
-<h3><%= page_entries_info @users %></h3>
+<% if @users.any? %>
+  <h3 class="margin"><%= page_entries_info @users %></h3>
 
   <table>
     <thead>
       <tr>
-        <th><%= t('admin.users.columns.name') %></th>
-        <th><%= t('admin.users.columns.email') %></th>
-        <th><%= t('admin.users.columns.document_number') %></th>
-        <th><%= t('admin.users.columns.roles') %></th>
-        <th><%= t('admin.users.columns.verification_level') %></th>
+        <th scope="col"><%= t("admin.users.columns.name") %></th>
+        <th scope="col"><%= t("admin.users.columns.email") %></th>
+        <th scope="col"><%= t("admin.users.columns.document_number") %></th>
+        <th scope="col"><%= t("admin.users.columns.roles") %></th>
+        <th scope="col"><%= t("admin.users.columns.verification_level") %></th>
       </tr>
     </thead>
-    <% @users.each do |user| %>
-      <tr>
-        <td><%= user.name %></td>
-        <td><%= user.email %></td>
-        <td><%= user.document_number %></td>
-        <td><%= display_user_roles(user) %></td>
-        <td><%= user.user_type %></td>
-      </tr>
-    <% end %>
+    <tbody>
+      <% @users.each do |user| %>
+        <tr>
+          <td><%= user.name %></td>
+          <td><%= user.email %></td>
+          <td><%= user.document_number %></td>
+          <td><%= display_user_roles(user) %></td>
+          <td><%= user.user_type %></td>
+        </tr>
+      <% end %>
+    </tbody>
   </table>
 
-<%= paginate @users %>
+  <%= paginate @users %>
+<% else %>
+  <div class="callout primary">
+    <%= t("admin.users.index.no_users") %>
+  </div>
+<% end %>
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index 2713399ed..ceee64394 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -1,16 +1,17 @@
 <h2><%= t("admin.users.index.title") %></h2>
 
-<div class="row">
+<div class="small-12 medium-6">
   <%= form_tag admin_users_path, method: :get, remote: true  do %>
-    <div class="small-12 medium-6 column">
+    <div class="input-group">
       <%= text_field_tag :search, '', placeholder: t('admin.users.search.placeholder') %>
-    </div>
-    <div class="small-12 medium-6 column">
-      <%= submit_tag t('admin.users.search.search'), class: 'button' %>
+      <div class="input-group-button">
+        <%= submit_tag t('admin.users.search.search'), class: 'button' %>
+      </div>
     </div>
   <% end %>
 </div>
 
-<div  id="users">
+
+<div id="users">
   <%= render "users" %>
 </div>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index d3360f0a9..f01129868 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -961,6 +961,7 @@ en:
         verification_level: Verification level
       index:
         title: User
+        no_users: There are no users.
       search:
         placeholder: Search user by email, name or document number
         search: Search
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index ddaac5dd0..5a25e5ee5 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -963,6 +963,7 @@ es:
         verification_level: Nivel de verficación
       index:
         title: Usuarios
+        no_users: No hay usuarios.
       search:
         placeholder: Buscar usuario por email, nombre o DNI
         search: Buscar