diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index 231c94d8d..6dc74f104 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -132,9 +132,8 @@ export default {
     User: {
       query() {
         return gql(`{
-          User(orderBy: name_asc) {
+          User(orderBy: slug_asc) {
             id
-            name
             slug
           }
         }`)
diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/index.vue
index 270c20840..5636c3714 100644
--- a/webapp/components/Editor/index.vue
+++ b/webapp/components/Editor/index.vue
@@ -13,7 +13,7 @@
           :class="{ 'is-selected': navigatedUserIndex === index }"
           @click="selectUser(user)"
         >
-          {{ user.name }}
+          @{{ user.slug }}
         </div>
       </template>
       <div
@@ -287,7 +287,7 @@ export default {
               }
               const fuse = new Fuse(items, {
                 threshold: 0.2,
-                keys: ['name']
+                keys: ['slug']
               })
               return fuse.search(query)
             }
@@ -360,7 +360,7 @@ export default {
         attrs: {
           // TODO: use router here
           url: `/profile/${user.id}`,
-          label: user.name
+          label: user.slug
         }
       })
       this.editor.focus()