Merge pull request #9197 from nextcloud/fix/provisioning/master-passw…

…ord-disabled-required fix(provisioning): Do not require master password if disabled
nextcloud · Dec 27, 2023 · c2a55a2 · c2a55a2
2 parents 09b8929 + 410e9bb
commit c2a55a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/components/settings/ProvisioningSettings.vue b/src/components/settings/ProvisioningSettings.vue
@@ -196,7 +196,7 @@
 								v-model="masterPassword"
 								:disabled="loading"
 								type="password"
-								required>
+								:required="masterPasswordEnabled">
 							<label for="mail-master-password"> {{ t('mail', 'Master password') }} </label>
 						</div>
 					</div>
@@ -402,7 +402,7 @@ export default {
 			smtpPort: this.setting.smtpPort || 587,
 			smtpUser: this.setting.smtpUser || '%USERID%domain.com',
 			smtpSslMode: this.setting.smtpSslMode || 'tls',
-			masterPasswordEnabled: this.setting.masterPasswordEnabled || '',
+			masterPasswordEnabled: this.setting.masterPasswordEnabled === true,
 			masterPassword: this.setting.masterPassword || '',
 			sieveEnabled: this.setting.sieveEnabled || '',
 			sieveHost: this.setting.sieveHost || '',