diff --git a/uhepp_org/uhepp_vault/templates/uhepp_vault/token_list.html b/uhepp_org/uhepp_vault/templates/uhepp_vault/token_list.html
index bc6adf4f374b0843f2a03ea1d6a30dc3eb2b0e8c..5b840e1af9efa2ff27b14818b8e8a461c0bd1969 100644
--- a/uhepp_org/uhepp_vault/templates/uhepp_vault/token_list.html
+++ b/uhepp_org/uhepp_vault/templates/uhepp_vault/token_list.html
@@ -37,9 +37,11 @@ password in environment variables.</p>
       <th scope="row">{{ token.description }}</th>
       <td>{{ token.created|date:"Y-m-d H:i" }}</td>
       <td>
-				{{ token.expires|default_if_none:"never" }}
-				{% if token.expired %}
-						<small class="text-danger">(Expired)</small>
+				{% if token.expires %}
+          {{ token.expires|date:"Y-m-d H:i" }}
+          {% if token.expired %}
+              <small class="text-danger">(Expired)</small>
+          {% endif %}
         {% endif %}
 			</td>
       <td>