diff --git a/src/components/NcPasswordField/NcPasswordField.vue b/src/components/NcPasswordField/NcPasswordField.vue
index a34ee80223..d2cee919fe 100644
--- a/src/components/NcPasswordField/NcPasswordField.vue
+++ b/src/components/NcPasswordField/NcPasswordField.vue
@@ -95,7 +95,6 @@ export default {
 <template>
 	<NcInputField v-bind="$props"
 		ref="inputField"
-		:autofocus="$attrs.autofocus"
 		:type="isPasswordHidden ? 'password' : 'text'"
 		:show-trailing-button="true"
 		:helper-text="computedHelperText"
@@ -217,6 +216,15 @@ export default {
 			default: '',
 		},
 
+		/**
+		 * The autofocus property defines whether the input should
+		 * automatically receive focus on page load
+		 */
+		autofocus: {
+			type: Boolean,
+			default: false,
+		},
+
 		/**
 		 * The minlength property defines the minimum number of characters
 		 * (as UTF-16 code units) the user can enter
diff --git a/src/components/NcTextField/NcTextField.vue b/src/components/NcTextField/NcTextField.vue
index d780228793..550122ee73 100644
--- a/src/components/NcTextField/NcTextField.vue
+++ b/src/components/NcTextField/NcTextField.vue
@@ -121,7 +121,6 @@ export default {
 <template>
 	<NcInputField v-bind="$props"
 		ref="inputField"
-		:autofocus="$attrs.autofocus"
 		:trailing-button-label="clearTextLabel"
 		v-on="$listeners"
 		@input="handleInput">
@@ -362,6 +361,33 @@ export default {
 			].includes(value),
 		},
 
+		/**
+		 * The autofocus property defines whether the input should
+		 * automatically receive focus on page load
+		 */
+		autofocus: {
+			type: Boolean,
+			default: false,
+		},
+
+		/**
+		 * The minlength property defines the minimum number of characters
+		 * (as UTF-16 code units) the user can enter
+		 */
+		minlength: {
+			type: Number,
+			default: 0,
+		},
+
+		/**
+		 * The maxlength property defines the maximum number of characters
+		 * (as UTF-16 code units) the user can enter
+		 */
+		maxlength: {
+			type: Number,
+			default: null,
+		},
+
 		/**
 		 * Allow to disable spellchecking
 		 */