diff --git a/src/components/NcPasswordField/NcPasswordField.vue b/src/components/NcPasswordField/NcPasswordField.vue
index dc2a727220..e0f0cb39a9 100644
--- a/src/components/NcPasswordField/NcPasswordField.vue
+++ b/src/components/NcPasswordField/NcPasswordField.vue
@@ -19,7 +19,9 @@ General purpose password field component.
 			<NcPasswordField id="textField"
 				v-model="text2"
 				:label-outside="true"
-				placeholder="Min. 12 characters" />
+				placeholder="Min. 12 characters"
+				:success="true"
+				helper-text="Password is secure" />
 		</div>
 		<div class="external-label">
 			<label for="textField2">New password</label>
@@ -32,10 +34,9 @@ General purpose password field component.
 		</div>
 
 		<NcPasswordField v-model="text4"
-			label="Good new password"
-			:success="true"
-			placeholder="Min. 12 characters"
-			helper-text="Password is secure" />
+			label="Validate new password"
+			check-password-strength
+			placeholder="Min. 12 characters" />
 
 		<NcPasswordField v-model="text5"
 			:disabled="true"
@@ -51,7 +52,7 @@ export default {
 	data() {
 		return {
 			text1: '',
-			text2: '',
+			text2: 'FWZxt29XEoTQfnBEa',
 			text3: 'hunter',
 			text4: '',
 			text5: '',
@@ -324,10 +325,10 @@ export default {
 
 	watch: {
 		model(newValue) {
-			if (this.checkPasswordStrength) {
-				if (passwordPolicy === null) {
-					return
-				}
+			// Reset internal validation state on value change
+			this.isValid = undefined
+			this.internalHelpMessage = ''
+			if (newValue && this.checkPasswordStrength) {
 				this.checkPassword(newValue)
 			}
 		},
diff --git a/styleguide/global.requires.js b/styleguide/global.requires.js
index 2b7a018470..c07a176d49 100644
--- a/styleguide/global.requires.js
+++ b/styleguide/global.requires.js
@@ -30,7 +30,7 @@ const USER_GROUPS = [
  * @param {object} error Axios error
  */
 function mockRequests(error) {
-	const { request } = error
+	const { request, config } = error
 	let data = null
 
 	// Mock requesting groups
@@ -39,6 +39,22 @@ function mockRequests(error) {
 		data = { groups: USER_GROUPS.filter((e) => !requestGroups[1] || e.displayname.startsWith(requestGroups[1]) || e.id.startsWith(requestGroups[1])) }
 	}
 
+	const requestPasswordPolicy = request.responseURL.match(/apps\/password_policy\/api\/v1\/validate/)
+	if (requestPasswordPolicy) {
+		const payload = typeof config.data === 'string' ? JSON.parse(config.data) : config.data
+
+		if (payload.password.length < 12) {
+			data = {
+				passed: false,
+				reason: 'Password needs to be at least 12 characters long',
+			}
+		} else {
+			data = {
+				passed: true,
+			}
+		}
+	}
+
 	if (data) {
 		return Promise.resolve({ data: { ocs: { data } } })
 	}