diff --git a/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue b/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue
index 57e9ac60357..46dd15e8adc 100644
--- a/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue
+++ b/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue
@@ -25,7 +25,6 @@
 		class="section"
 		@submit.stop.prevent="() => {}">
 		<HeaderBar
-			:can-edit-emails="displayNameChangeSupported"
 			:is-valid-form="isValidForm"
 			:scope.sync="primaryEmail.scope"
 			@addAdditionalEmail="onAddAdditionalEmail" />
@@ -36,18 +35,17 @@
 				:scope.sync="primaryEmail.scope"
 				:email.sync="primaryEmail.value"
 				@update:email="onUpdateEmail" />
-			<Email v-for="(additionalEmail, index) in additionalEmails"
-				:key="index"
-				:index="index"
-				:scope.sync="additionalEmail.scope"
-				:email.sync="additionalEmail.value"
-				@update:email="onUpdateEmail"
-				@deleteAdditionalEmail="onDeleteAdditionalEmail(index)" />
 		</template>
-
 		<span v-else>
 			{{ primaryEmail.value || t('settings', 'No email address set') }}
 		</span>
+		<Email v-for="(additionalEmail, index) in additionalEmails"
+			:key="index"
+			:index="index"
+			:scope.sync="additionalEmail.scope"
+			:email.sync="additionalEmail.value"
+			@update:email="onUpdateEmail"
+			@deleteAdditionalEmail="onDeleteAdditionalEmail(index)" />
 	</form>
 </template>
 
diff --git a/apps/settings/src/components/PersonalInfo/EmailSection/HeaderBar.vue b/apps/settings/src/components/PersonalInfo/EmailSection/HeaderBar.vue
index 7d2b1ab76b6..6c251a880b4 100644
--- a/apps/settings/src/components/PersonalInfo/EmailSection/HeaderBar.vue
+++ b/apps/settings/src/components/PersonalInfo/EmailSection/HeaderBar.vue
@@ -31,7 +31,7 @@
 			:scope.sync="localScope"
 			@update:scope="onScopeChange" />
 
-		<AddButton v-if="canEditEmails"
+		<AddButton
 			class="add-button"
 			:disabled="!isValidForm"
 			@click.stop.prevent="addAdditionalEmail" />
@@ -51,10 +51,6 @@ export default {
 	},
 
 	props: {
-		canEditEmails: {
-			type: Boolean,
-			default: true,
-		},
 		isValidForm: {
 			type: Boolean,
 			default: true,