diff --git a/app/views/clients/index.html.erb b/app/views/clients/index.html.erb
index 191f1c2..48c0b36 100644
--- a/app/views/clients/index.html.erb
+++ b/app/views/clients/index.html.erb
@@ -1,54 +1,54 @@
 <div class="row right">
   <%= link_to 'New Client', new_host_path, class: 'btn btn-primary', role: 'button' %>
 </div>
 
 <h1>My Clients</h1>
 
 <div class="table-responsive">
   <table class="table table-striped table-bordered table-condensed">
     <thead>
       <tr>
         <th>Name</th>
         <th>Uname</th>
         <th>Active Jobs</th>
         <th>Last Backup</th>
         <th>File Ret. (days)</th>
         <th>Job Ret. (days)</th>
         <th>Space Used</th>
         <th>Quota</th>
         <th>Space Used %</th>
         <th>Files</th>
       </tr>
     </thead>
 
     <tbody>
       <%= render partial: 'client', collection: @clients %>
     </tbody>
   </table>
 </div>
 
 <% if @hosts.any? %>
   <h1>My Pending Clients</h1>
 
   <div class="table-responsive">
     <table class="table table-striped table-bordered table-condensed">
       <thead>
         <tr>
           <th>Name</th>
           <th>FQDN</th>
           <th>Port</th>
-          <th>Password</th>
+          <th>Token</th>
           <th>FileRetention (days)</th>
           <th>JobRetention (days)</th>
           <th>Verified</th>
           <th>Created At</th>
         </tr>
       </thead>
       <tbody>
         <%= render partial: 'hosts/host', collection: @hosts %>
       </tbody>
     </table>
   </div>
 <% end %>
 
 <%= render partial: 'client_graphs', locals: { path: clients_path } %>
diff --git a/app/views/hosts/_host_details.html.erb b/app/views/hosts/_host_details.html.erb
index 55b9b89..08e46f9 100644
--- a/app/views/hosts/_host_details.html.erb
+++ b/app/views/hosts/_host_details.html.erb
@@ -1,73 +1,73 @@
 <div class="col-xs-4">
   <div class="table-responsive">
     <table class="table table-striped table-bordered table-condensed">
       <tr>
         <td><b>Name</b></td>
         <td><%= @host.name %></td>
       </tr>
       <tr>
         <td><b>FQDN</b></td>
         <td><%= @host.fqdn %></td>
       </tr>
       <tr>
         <td><b>FDPort</b></td>
         <td><%= @host.port %></td>
       </tr>
       <tr>
-        <td><b>Password</b></td>
+        <td><b>Token</b></td>
         <td>********</td>
       </tr>
       <tr>
         <td><b>File Retention</b></td>
         <td><%= @host.file_retention %> days</td>
       </tr>
       <tr>
         <td><b>Job Retention</b></td>
         <td><%= @host.job_retention %> days</td>
       </tr>
       <tr>
         <td><b>Verified</b></td>
         <td>
           <% if @host.verified? %>
             <span class="label label-success">yes</span>
           <% else %>
             <span class="label label-danger">no</span>
           <% end %>
         </td>
       </tr>
       <tr>
         <td><b>Created</b></td>
         <td><%= I18n.l(@host.created_at, format: :long) %></td>
       </tr>
     </table>
   </div>
 
   <div class='row'>
     <div class='col-xs-2'>
       <%= link_to 'Edit', edit_host_path(@host), class: "btn btn-primary", role: "button" %>
     </div>
 
     <% if @host.needs_dispatch? %>
       <div class='col-xs-4 pull-right text-right'>
         <%= link_to 'Deploy Changes', submit_config_host_path(@host), method: :post,
                     class: 'btn btn-success', role: 'button' %>
       </div>
     <% end %>
     <% if @host.needs_revoke? %>
       <div class='col-xs-4 pull-right text-right'>
         <%= link_to 'Remove From Bacula', revoke_host_path(@host), method: :delete,
                     class: 'btn btn-danger', role: 'button' %>
       </div>
     <% end %>
   </div>
 
   <br />
 
   <div class='row'>
     <% if @host.client %>
       <div class='col-xs-12 text-right'>
         <%= link_to "Back to <b>#{@host.name}</b> client".html_safe, client_path(@host.client) %>
       </div>
     <% end %>
   </div>
 </div>