diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index 5e972d82..e7a961f1 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -1,11 +1,6 @@
-<<<<<<< HEAD
 import { compose } from 'vue-compose'
 import unescape from 'lodash/unescape'
 import get from 'lodash/get'
-=======
-import { unescape, truncate } from 'lodash'
->>>>>>> Add OAuth Tokens management to settings
-
 import TabSwitcher from '../tab_switcher/tab_switcher.js'
 import ImageCropper from '../image_cropper/image_cropper.vue'
 import StyleSwitcher from '../style_switcher/style_switcher.vue'
@@ -94,20 +89,17 @@ const UserSettings = {
         direct: { selected: this.newDefaultScope === 'direct' }
       }
     },
-<<<<<<< HEAD
     currentSaveStateNotice () {
       return this.$store.state.interface.settings.currentSaveStateNotice
-=======
+    },
     oauthTokens () {
       return this.$store.state.oauthTokens.tokens.map(oauthToken => {
         return {
           id: oauthToken.id,
-          token: truncate(oauthToken.token, { length: 15 }),
-          refreshToken: truncate(oauthToken.refresh_token, { length: 15 }),
+          appName: oauthToken.app_name,
           validUntil: new Date(oauthToken.valid_until).toLocaleDateString()
         }
       })
->>>>>>> Add OAuth Tokens management to settings
     }
   },
   methods: {
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 116c1335..a1123638 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -126,16 +126,14 @@
             <table class="oauth-tokens">
               <thead>
                 <tr>
-                  <th>{{$t('settings.token')}}</th>
-                  <th>{{$t('settings.refresh_token')}}</th>
+                  <th>{{$t('settings.app_name')}}</th>
                   <th>{{$t('settings.valid_until')}}</th>
                   <th></th>
                 </tr>
               </thead>
               <tbody>
                 <tr v-for="oauthToken in oauthTokens" :key="oauthToken.id">
-                  <td>{{oauthToken.token}}</td>
-                  <td>{{oauthToken.refreshToken}}</td>
+                  <td>{{oauthToken.appName}}</td>
                   <td>{{oauthToken.validUntil}}</td>
                   <td class="actions">
                     <button class="btn btn-default" @click="revokeToken(oauthToken.id)">
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 0aeb70ab..df8f6f6c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -106,6 +106,7 @@
     }
   },
   "settings": {
+    "app_name": "App name",
     "attachmentRadius": "Attachments",
     "attachments": "Attachments",
     "autoload": "Enable automatic loading when scrolled to the bottom",