diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 648d7ec0..957805e9 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -601,6 +601,12 @@ class User(Base, BaseModel):
                                        UserApiKeys.role == UserApiKeys.ROLE_ALL))
         return tokens.all()
 
+    @property
+    def builtin_token_roles(self):
+        return map(UserApiKeys._get_role_name, [
+            UserApiKeys.ROLE_API, UserApiKeys.ROLE_FEED, UserApiKeys.ROLE_HTTP
+        ])
+
     @property
     def ip_addresses(self):
         ret = UserIpMap.query().filter(UserIpMap.user == self).all()
diff --git a/rhodecode/templates/admin/my_account/my_account_auth_tokens.html b/rhodecode/templates/admin/my_account/my_account_auth_tokens.html
index a9de1e83..53adb144 100644
--- a/rhodecode/templates/admin/my_account/my_account_auth_tokens.html
+++ b/rhodecode/templates/admin/my_account/my_account_auth_tokens.html
@@ -10,11 +10,15 @@
       <table class="rctable auth_tokens">
         <tr>
             <td class="truncate-wrap td-authtoken"><div class="user_auth_tokens truncate autoexpand"><code>${c.user.api_key}</code></div></td>
-            <td class="td-buttons">
-                <span class="btn btn-mini btn-info disabled">${_('Built-in')}</span>
+            <td class="td-tags">
+                <span class="tag disabled">${_('Built-in')}</span>
             </td>
-            <td class="td-buttons">
-                <span class="btn btn-mini btn-info disabled">all</span>
+            <td class="td-tags">
+                % for token in c.user.builtin_token_roles:
+                <span class="tag disabled">
+                    ${token}
+                </span>
+                % endfor
             </td>
             <td class="td-exp">${_('expires')}: ${_('never')}</td>
             <td class="td-action">
@@ -34,8 +38,8 @@
               <tr class="${'expired' if auth_token.expired else ''}">
                 <td class="truncate-wrap td-authtoken"><div class="user_auth_tokens truncate autoexpand"><code>${auth_token.api_key}</code></div></td>
                 <td class="td-wrap">${auth_token.description}</td>
-                <td class="td-buttons">
-                    <span class="btn btn-mini btn-info disabled">${auth_token.role_humanized}</span>
+                <td class="td-tags">
+                    <span class="tag disabled">${auth_token.role_humanized}</span>
                 </td>
                 <td class="td-exp">
                      %if auth_token.expires == -1:
diff --git a/rhodecode/templates/admin/users/user_edit_auth_tokens.html b/rhodecode/templates/admin/users/user_edit_auth_tokens.html
index d025d80f..0cad7b06 100644
--- a/rhodecode/templates/admin/users/user_edit_auth_tokens.html
+++ b/rhodecode/templates/admin/users/user_edit_auth_tokens.html
@@ -11,7 +11,11 @@
                     <span class="tag disabled">${_('Built-in')}</span>
                 </td>
                 <td class="td-tags">
-                    <span class="tag disabled">all</span>
+                    % for token in c.user.builtin_token_roles:
+                    <span class="tag disabled">
+                        ${token}
+                    </span>
+                    % endfor
                 </td>
                 <td class="td-exp">${_('expires')}: ${_('never')}</td>
                 <td class="td-action">