diff --git a/ui/app/adapters/application.js b/ui/app/adapters/application.js
index 96837c027..f181d2cf5 100644
--- a/ui/app/adapters/application.js
+++ b/ui/app/adapters/application.js
@@ -13,11 +13,11 @@ export default RESTAdapter.extend({
 
   headers: computed('token.secret', function() {
     const token = this.get('token.secret');
-    return (
-      token && {
+    if (token) {
+      return {
         'X-Nomad-Token': token,
-      }
-    );
+      };
+    }
   }),
 
   findAll() {
diff --git a/ui/app/controllers/settings/tokens.js b/ui/app/controllers/settings/tokens.js
index 5ea1f2a50..2aad23469 100644
--- a/ui/app/controllers/settings/tokens.js
+++ b/ui/app/controllers/settings/tokens.js
@@ -20,7 +20,6 @@ export default Controller.extend({
     clearTokenProperties() {
       this.get('token').setProperties({
         secret: undefined,
-        accessor: undefined,
       });
       this.setProperties({
         tokenIsValid: false,
@@ -55,7 +54,7 @@ export default Controller.extend({
           });
         },
         () => {
-          this.set('token.secret', null);
+          this.set('token.secret', undefined);
           this.setProperties({
             tokenIsValid: false,
             tokenIsInvalid: true,