diff --git a/src/components/AccountForm.vue b/src/components/AccountForm.vue
index 4bf3ddb5d5..282dc8d192 100644
--- a/src/components/AccountForm.vue
+++ b/src/components/AccountForm.vue
@@ -27,10 +27,11 @@
 					:class="{ 'account-form__label': hasPasswordAlternatives, 'account-form__label--required': !hasPasswordAlternatives }">{{ t('mail', 'Password') }}</label>
 
 				<NcPasswordField id="auto-password"
+					:value.sync="autoConfig.password"
 					:disabled="loading"
+					type="password"
 					:label="t('mail', 'Password')"
 					:required="!hasPasswordAlternatives"
-					:value.sync="password"
 					@change="clearFeedback" />
 			</Tab>
 			<Tab id="manual" key="manual" :name="t('mail', 'Manual')">
@@ -116,8 +117,8 @@
 				<label v-if="!useOauth" for="man-imap-password" class="account-form__label--required">{{ t('mail', 'IMAP Password') }}</label>
 				<NcPasswordField v-if="!useOauth"
 					id="man-imap-password"
-					:value.sync="password"
 					type="password"
+					:value.sync="manualConfig.imapPassword"
 					:label="t('mail', 'IMAP Password')"
 					:disabled="loading"
 					required
@@ -188,7 +189,8 @@
 				<label v-if="!useOauth" for="man-smtp-password" class="account-form__label--required">{{ t('mail', 'SMTP Password') }}</label>
 				<NcPasswordField v-if="!useOauth"
 					id="man-smtp-password"
-					:value.sync="password"
+					type="password"
+					:value.sync="manualConfig.smtpPassword"
 					:lable="t('mail', 'SMTP Password')"
 					:disabled="loading"
 					required