diff --git a/src/components/NcActionInput/NcActionInput.vue b/src/components/NcActionInput/NcActionInput.vue
index 043a28e731..147b71a897 100644
--- a/src/components/NcActionInput/NcActionInput.vue
+++ b/src/components/NcActionInput/NcActionInput.vue
@@ -201,11 +201,9 @@ For the multiselect component, all events will be passed through. Please see the
 								:label="text"
 								:disabled="disabled"
 								:input-class="{ focusable: isFocusable }"
-								trailing-button-icon="arrowRight"
 								:show-trailing-button="showTrailingButton && !disabled"
 								v-bind="$attrs"
 								v-on="$listeners"
-								@trailing-button-click="$refs.form.requestSubmit()"
 								@input="onInput"
 								@change="onChange" />
 
@@ -230,6 +228,7 @@ For the multiselect component, all events will be passed through. Please see the
 								:input-class="{ focusable: isFocusable }"
 								:type="type"
 								trailing-button-icon="arrowRight"
+								:trailing-button-label="trailingButtonLabel"
 								:show-trailing-button="showTrailingButton && !disabled"
 								v-bind="$attrs"
 								v-on="$listeners"
@@ -252,6 +251,7 @@ import NcSelect from '../NcSelect/index.js'
 import NcTextField from '../NcTextField/index.js'
 import ActionGlobalMixin from '../../mixins/actionGlobal.js'
 import GenRandomId from '../../utils/GenRandomId.js'
+import { t } from '../../l10n.js'
 
 export default {
 	name: 'NcActionInput',
@@ -361,12 +361,19 @@ export default {
 			default: null,
 		},
 		/**
-		 * Attribute forwarded to the underlining NcPasswordField and NcTextField
+		 * Attribute forwarded to the underlying NcPasswordField and NcTextField
 		 */
 		showTrailingButton: {
 			type: Boolean,
 			default: true,
 		},
+		/**
+		 * Trailing button label forwarded to the underlying NcTextField
+		 */
+		trailingButtonLabel: {
+			type: String,
+			default: t('Submit'),
+		},
 	},
 
 	emits: [
diff --git a/src/components/NcPasswordField/NcPasswordField.vue b/src/components/NcPasswordField/NcPasswordField.vue
index db77bfb70c..ef9dadd39e 100644
--- a/src/components/NcPasswordField/NcPasswordField.vue
+++ b/src/components/NcPasswordField/NcPasswordField.vue
@@ -97,7 +97,7 @@ export default {
 	<NcInputField v-bind="{...$attrs, ...$props }"
 		ref="inputField"
 		:type="isPasswordHidden ? 'password' : 'text'"
-		:show-trailing-button="showTrailingButton && true"
+		:show-trailing-button="showTrailingButton"
 		:trailing-button-label="trailingButtonLabelPassword"
 		:helper-text="computedHelperText"
 		:error="computedError"