diff --git a/website/client/src/pages/settings-overview.vue b/website/client/src/pages/settings-overview.vue
index bf24484618..93ce4a727a 100644
--- a/website/client/src/pages/settings-overview.vue
+++ b/website/client/src/pages/settings-overview.vue
@@ -100,6 +100,10 @@
         width: 20%;
       }
 
+      .input-area .settings-label {
+        width: unset;
+      }
+
       .settings-value {
         color: $gray-50;
 
diff --git a/website/client/src/pages/settings/generalSettings.vue b/website/client/src/pages/settings/generalSettings.vue
index c133602adf..112777a610 100644
--- a/website/client/src/pages/settings/generalSettings.vue
+++ b/website/client/src/pages/settings/generalSettings.vue
@@ -16,6 +16,7 @@
       <table class="table">
         <user-name-setting />
         <user-email-setting />
+        <display-name-setting />
         <tr>
           <td colspan="3"></td>
         </tr>
@@ -52,9 +53,11 @@
 import notificationsMixin from '../../mixins/notifications';
 import UserNameSetting from '@/pages/settings/inlineSettings/userNameSetting';
 import UserEmailSetting from '@/pages/settings/inlineSettings/userEmailSetting';
+import DisplayNameSetting from '@/pages/settings/inlineSettings/displayNameSetting';
 
 export default {
   components: {
+    DisplayNameSetting,
     UserEmailSetting,
     UserNameSetting,
   },
diff --git a/website/client/src/pages/settings/inlineSettings/displayNameSetting.vue b/website/client/src/pages/settings/inlineSettings/displayNameSetting.vue
new file mode 100644
index 0000000000..a0550fa048
--- /dev/null
+++ b/website/client/src/pages/settings/inlineSettings/displayNameSetting.vue
@@ -0,0 +1,217 @@
+<template>
+  <fragment>
+    <tr
+      v-if="!show"
+    >
+      <td class="settings-label">
+        {{ $t("displayName") }}
+      </td>
+      <td class="settings-value">
+        {{ user.profile.name }}
+      </td>
+      <td class="settings-button">
+        <a
+          class="edit-link"
+          @click.prevent="show = true"
+        >
+          {{ $t('edit') }}
+        </a>
+      </td>
+    </tr>
+    <tr
+      v-if="show"
+      class="expanded"
+    >
+      <td colspan="3">
+        <div
+          v-once
+          class="dialog-title"
+        >
+          {{ $t("displayName") }}
+        </div>
+        <div
+          v-once
+          class="dialog-disclaimer"
+        >
+          {{ $t("changeDisplayNameDisclaimer") }}
+        </div>
+
+        <div class="input-area">
+          <div class="settings-label">
+            {{ $t("displayName") }}
+          </div>
+          <div
+            class="form"
+            name="changeDisplayName"
+            novalidate="novalidate"
+          >
+            <div class="form-group">
+              <input
+                id="changeDisplayname"
+                v-model="temporaryDisplayName"
+                class="form-control"
+                type="text"
+                :placeholder="$t('newDisplayName')"
+                :class="{'is-invalid input-invalid': displayNameInvalid}"
+              >
+              <div
+                v-if="displayNameIssues.length > 0"
+                class="mb-3"
+              >
+                <div
+                  v-for="issue in displayNameIssues"
+                  :key="issue"
+                  class="input-error"
+                >
+                  {{ issue }}
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <save-cancel-buttons
+            :disable-save="displayNameCannotSubmit"
+            @saveClicked="changeDisplayName(temporaryDisplayName)"
+            @cancelClicked="resetAndClose()"
+          />
+        </div>
+      </td>
+    </tr>
+  </fragment>
+</template>
+
+<style lang="scss" scoped>
+@import '~@/assets/scss/colors.scss';
+
+.input-group {
+  position: relative;
+  background: white;
+}
+
+input {
+  margin-right: 2rem;
+}
+
+.input-floating-checkmark {
+  position: absolute;
+  background: none !important;
+  right: 0.5rem;
+  top: 0.5rem;
+
+  width: 1rem;
+  height: 1rem;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.input-group.is-valid {
+  border-color: $green-10 !important;
+}
+
+.input-group:not(.is-valid) {
+  .check-icon {
+    display: none;
+  }
+}
+
+.check-icon {
+  width: 12px;
+  height: 10px;
+  color: $green-50;
+}
+
+.form-group {
+  margin-bottom: 1.5rem;
+}
+
+</style>
+
+<script>
+import axios from 'axios';
+import * as validator from 'validator';
+import debounce from 'lodash/debounce';
+import { mapState } from '@/libs/store';
+
+import checkIcon from '@/assets/svg/check.svg';
+import SaveCancelButtons from '@/pages/settings/inlineSettings/_saveCancelButtons';
+import { _InlineSettingMixin } from '@/pages/settings/inlineSettings/_inlineSettingMixin';
+
+export default {
+  components: { SaveCancelButtons },
+  mixins: [_InlineSettingMixin],
+  data () {
+    return {
+      show: false,
+
+      temporaryDisplayName: '',
+      displayNameIssues: [],
+      updates: {
+        newEmail: '',
+        password: '',
+      },
+      icons: Object.freeze({
+        checkIcon,
+      }),
+    };
+  },
+  computed: {
+    ...mapState({
+      user: 'user.data',
+    }),
+    validEmail () {
+      return validator.isEmail(this.updates.newEmail);
+    },
+    allowedToSave () {
+      return !this.validEmail || this.updates.password.length === 0;
+    },
+    displayNameInvalid () {
+      if (this.temporaryDisplayName.length <= 1) return false;
+      return !this.displayNameValid;
+    },
+    displayNameValid () {
+      if (this.temporaryDisplayName.length <= 1) return false;
+      return this.displayNameIssues.length === 0;
+    },
+    displayNameCannotSubmit () {
+      if (this.temporaryDisplayName.length <= 1) return true;
+      return !this.displayNameValid;
+    },
+  },
+  mounted () {
+    this.restoreDisplayName();
+  },
+  methods: {
+    resetAndClose () {
+      this.show = false;
+    },
+    restoreDisplayName () {
+      if (this.temporaryDisplayName.length < 1) {
+        this.temporaryDisplayName = this.user.profile.name;
+      }
+    },
+    async changeDisplayName (newName) {
+      await axios.put('/api/v4/user/', { 'profile.name': newName });
+      window.alert(this.$t('displayNameSuccess')); // eslint-disable-line no-alert
+      this.user.profile.name = newName;
+      this.temporaryDisplayName = newName;
+    },
+    validateDisplayName: debounce(function checkName (displayName) {
+      if (displayName.length <= 1 || displayName === this.user.profile.name) {
+        this.displayNameIssues = [];
+        return;
+      }
+      this.$store.dispatch('auth:verifyDisplayName', {
+        displayName,
+      }).then(res => {
+        if (res.issues !== undefined) {
+          this.displayNameIssues = res.issues;
+        } else {
+          this.displayNameIssues = [];
+        }
+      });
+    }, 500),
+  },
+};
+</script>