diff --git a/app/views/admin/users/_user.html.erb b/app/views/admin/users/_user.html.erb
index 2ca9474..94699ad 100644
--- a/app/views/admin/users/_user.html.erb
+++ b/app/views/admin/users/_user.html.erb
@@ -1,35 +1,36 @@
 <tr>
   <td><%= link_to "##{user.id}", admin_user_path(user) %></td>
   <td><%= link_to user.username, admin_user_path(user) %></td>
   <td><%= user.email %></td>
   <td><%= user.user_type %></td>
   <td><%= I18n.l(user.created_at, format: :short) %></td>
+  <td><%= I18n.l(user.login_at, format: :short) rescue '-' %></td>
   <td><%= inline_list @baculized_host_names[user.id] %></td>
   <td><%= inline_list @unverified_host_names[user.id] %></td>
   <td><%= inline_list @non_baculized_host_names[user.id] %></td>
   <td>
     <%= link_to admin_user_path(user) do %>
       <label class="glyphicon glyphicon-eye-open text-primary" alt="show"></label>
     <% end %>
     <% if user.editable? %>
       <%= link_to edit_admin_user_path(user) do %>
         <label class="glyphicon glyphicon-edit text-primary" alt="show"></label>
       <% end %>
     <% end %>
   </td>
   <td>
     <% if user.enabled? %>
       <%= link_to ban_admin_user_path(user), method: :patch, class: 'btn btn-default',
                   data: { confirm: "User #{user.username} will be banned" } do %>
         <label class="glyphicon glyphicon-ban-circle text-danger"></label>
         Ban
       <% end %>
     <% else %>
       <%= link_to unban_admin_user_path(user), method: :patch, class: 'btn btn-default',
                   data: { confirm: "User #{user.username} will be unbanned" } do %>
         <label class="glyphicon glyphicon-ok-circle text-success"></label>
         Unban
       <% end %>
     <% end %>
   </td>
 </tr>
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index 1f06a17..009c388 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -1,35 +1,36 @@
 <div class="row right">
   <%= link_to new_admin_user_path, class: "btn btn-default", role: "button" do %>
     <label class="glyphicon glyphicon-plus text-primary"></label>
     New Admin
   <% end %>
 </div>
 
 <h1>Users</h1>
 
 <div class="row">
   <div class="col-xs-12">
     <div class="table-responsive">
       <table class="table table-striped table-bordered table-condensed">
         <thead>
           <tr>
             <th>id</th>
             <th>Username</th>
             <th>Email</th>
             <th>User type</th>
             <th>Created at</th>
+            <th>Last login at</th>
             <th>Clients</th>
             <th>Unverified hosts</th>
             <th>Pending hosts</th>
             <th>Actions</th>
             <th>Ban</th>
           </tr>
         </thead>
 
         <tbody>
           <%= render partial: 'user', collection: @users %>
         </tbody>
       </table>
     </div>
   </div>
 </div>