diff --git a/src/Components/Request/IdentifySigner.vue b/src/Components/Request/IdentifySigner.vue
index b75e480f29..29532e00dc 100644
--- a/src/Components/Request/IdentifySigner.vue
+++ b/src/Components/Request/IdentifySigner.vue
@@ -7,8 +7,9 @@
 			@update:account="updateAccount"
 			@update:email="updateEmail"
 			@update:display-name="updateDisplayName" />
-		<label for="name-input">{{ t('libresign', 'Signer name') }}</label>
-		<NcTextField v-model="displayName"
+		<label v-if="signerSelected" for="name-input">{{ t('libresign', 'Signer name') }}</label>
+		<NcTextField v-if="signerSelected"
+			v-model="signerSelected"
 			aria-describedby="name-input"
 			autocapitalize="none"
 			:label="t('libresign', 'Signer name')"
@@ -21,7 +22,9 @@
 				<NcButton @click="filesStore.disableIdentifySigner()">
 					{{ t('libresign', 'Cancel') }}
 				</NcButton>
-				<NcButton type="primary" @click="saveSigner">
+				<NcButton type="primary"
+					:disabled="!signerSelected"
+					@click="saveSigner">
 					{{ saveButtonText }}
 				</NcButton>
 			</div>
@@ -101,6 +104,9 @@ export default {
 				return {}
 			}
 		},
+		signerSelected() {
+			return this.methods.account.value || this.methods.email.value
+		},
 		isNewSigner() {
 			return this.id === null || this.id === undefined
 		},