diff --git a/frontend/src/views/UserProfile.vue b/frontend/src/views/UserProfile.vue
index 7c156512..c75f193a 100644
--- a/frontend/src/views/UserProfile.vue
+++ b/frontend/src/views/UserProfile.vue
@@ -64,7 +64,7 @@ export default Vue.extend({
         email: this.form.email,
       };
 
-      if (this.form.passwordLogin) {
+      if (this.form.passwordLogin && this.form.password) {
         if (this.form.password !== this.form.password2) {
           this.$utils.toast(this.$t('users.passwordMismatch'), 'is-danger');
           return;
diff --git a/frontend/src/views/Users.vue b/frontend/src/views/Users.vue
index 6da957ce..4ac9daee 100644
--- a/frontend/src/views/Users.vue
+++ b/frontend/src/views/Users.vue
@@ -41,8 +41,13 @@
         <a :href="`/users/${props.row.id}`" @click.prevent="showEditForm(props.row)"
           :class="{ 'has-text-grey': props.row.status === 'disabled' }">
           {{ props.row.username }}
-          <div class="has-text-grey is-size-7">{{ props.row.name }}</div>
         </a>
+        <b-tag v-if="props.row.status === 'disabled'">
+          {{ $t(`users.status.${props.row.status}`) }}
+        </b-tag>
+        <div class="has-text-grey is-size-7">
+          {{ props.row.name }}
+        </div>
       </b-table-column>
 
       <b-table-column v-slot="props" field="status" :label="$tc('users.role')" header-class="cy-status" sortable
@@ -54,9 +59,6 @@
           <b-icon icon="code" />
           {{ $t(`users.type.${props.row.type}`) }}
         </b-tag>
-        <b-tag v-if="props.row.status === 'disabled'">
-          {{ $t(`users.status.${props.row.status}`) }}
-        </b-tag>
       </b-table-column>
 
       <b-table-column v-slot="props" field="name" :label="$t('subscribers.email')" header-class="cy-name" sortable