diff --git a/app/views/admin/users/_index.html.erb b/app/views/admin/users/_index.html.erb
index 919feba..69e975c 100644
--- a/app/views/admin/users/_index.html.erb
+++ b/app/views/admin/users/_index.html.erb
@@ -131,6 +131,8 @@
               <h5>ORCID Token</h5>
               <% if user.orcid_token.blank? %>
                 Missing
+              <% elsif user.orcid_expires_at.nil? %>
+                No expiration
               <% elsif DateTime.parse(user.orcid_expires_at) < Time.zone.now %>
                 Expired
               <% else %>
@@ -141,7 +143,7 @@
               <div class="panel-footer">
                 <span class="title pull-left"><%= link_to_if user.claims_count > 0, pluralize(user.claims_count, "Claim"), admin_claims_path(source: params[:source], state: params[:state], user_id: user.uid) %></span>
                 <div class="btn-toolbar">
-                   <% if can?(:manage, user) && Time.zone.now < user.orcid_expires_at %>
+                   <% if user.orcid_expires_at.present? && Time.zone.now < DateTime.parse(user.orcid_expires_at) %>
                     <div class="btn-group btn-group-sm pull-right">
                       <%= link_to 'delete token', admin_user_path(user.uid, user: { orcid_token: nil, orcid_expires_at: Time.zone.now }), { method: :put, remote: true, class: 'btn btn-sm btn-warning btn-fill' } %>
                     </div>