diff --git a/lib/units/websocket/index.js b/lib/units/websocket/index.js
index bdb4e931..89d91b82 100644
--- a/lib/units/websocket/index.js
+++ b/lib/units/websocket/index.js
@@ -345,7 +345,7 @@ module.exports = function(options) {
           , secret: options.secret
           })
 
-          var tokenId = uuid.v4()
+          var tokenId = util.format('%s-%s', uuid.v4(), uuid.v4()).replace(/-/g, '')
             , title = data.title
 
           return dbapi.saveUserAccessToken(user.email, {
diff --git a/res/app/settings/keys/access-tokens/access-tokens.jade b/res/app/settings/keys/access-tokens/access-tokens.jade
index 2d6d6456..3ee391c7 100644
--- a/res/app/settings/keys/access-tokens/access-tokens.jade
+++ b/res/app/settings/keys/access-tokens/access-tokens.jade
@@ -29,7 +29,7 @@
         textarea(readonly, rows='1', text-focus-select, ng-model='newToken.tokenId').form-control.token-id-textarea
 
     ul.list-group.key-list
-      li.list-group-item(ng-repeat='title in accessTokenTitles').animate-repeat
+      li.list-group-item(ng-repeat='title in accessTokenTitles track by $index').animate-repeat
         a
           i.fa.fa-key.fa-2x.fa-fw.key-list-icon
           .key-list-details.selectable