diff --git a/public/globals.js b/public/globals.js
index d4b8ee796..963f813bf 100644
--- a/public/globals.js
+++ b/public/globals.js
@@ -839,12 +839,12 @@ window.pkp = {
 		'userInvitation.edit.message':
 			'If you edit the existing invitation or add a new role, the current invitation will be canceled and, a new one will be sent. Are you sure you want to proceed?',
 		'userInvitation.edit.title': 'Edit Invitation',
-		'userInvitation.emailField.description': 'e.g. aeinstein@example.com',
+		'userInvitation.searchField.description':
+			'e.g. aeinstein@example.com or aeinstein or 0000-0000-0000-0000',
 		'userInvitation.modal.button': 'View All Users',
 		'userInvitation.modal.message':
 			"{$email} has been invited to new role in OJS. You can be updated about the user's decision on the User and Role page, your OJS notification and/or your email",
 		'userInvitation.modal.title': 'Invitation Sent',
-		'userInvitation.orcidField.description': 'e.g. 0000-0000-0000-0000',
 		'userInvitation.roleTable.endDate': 'End Date',
 		'userInvitation.roleTable.journalMasthead': 'Journal Masthead',
 		'userInvitation.roleTable.role': 'Role',
@@ -853,7 +853,6 @@ window.pkp = {
 		'userInvitation.search.userNotFound':
 			'The user does not have a role in this journal',
 		'userInvitation.status.invited': 'Invited {$date}',
-		'userInvitation.usernameField.description': 'e.g. mickeymouse',
 		'validator.required': 'This field is required.',
 		'workflow.review.externalReview': 'Review',
 		'workflow.review.internalReview': 'Internal Review',
@@ -867,6 +866,19 @@ window.pkp = {
 		'workflow.submissionNextReviewRoundInFutureStage':
 			'The submission advanced to the next review round, was accepted, and is currently in the {$stage} stage.',
 		'workflow.uploadRevisions': 'Upload revisions',
+		'userInvitation.searchField':
+			'Search for a user by email address, username, or ORCID iD. Enter only one to get started!',
+		'grid.user.enable': 'Enable User',
+		'grid.user.disable': 'Disable User',
+		'grid.user.remove': 'Remove User',
+		'grid.user.logInAs': 'Login As',
+		'grid.user.grid.user.enableReasonDescription':
+			"Once the user is enabled, they will regain access to OJS, and you'll be able to invite them to roles as needed.",
+		'grid.user.grid.user.disableReasonDescription':
+			"Please note that once a user is disabled, you won't be able to add them to any roles until they are enabled again.",
+		'user.disabledModal.description': 'Current Roles : {$roles}',
+		'user.disabledModal.title': 'Disable {$fullName}',
+		'user.enabledModal.title': 'Enable {$fullName}',
 	},
 	tinyMCE: {
 		skinUrl: '/styles/tinymce',
diff --git a/src/components/Modal/SideModalBodyLegacyAjax.vue b/src/components/Modal/SideModalBodyLegacyAjax.vue
index 07447fcd1..5f63a5e1f 100644
--- a/src/components/Modal/SideModalBodyLegacyAjax.vue
+++ b/src/components/Modal/SideModalBodyLegacyAjax.vue
@@ -1,6 +1,9 @@
 <template>
 	<SideModalBody>
 		<template #title>{{ legacyOptions.title }}</template>
+		<template #description>
+			<p class="mt-1 text-lg-normal">{{ legacyOptions.description }}</p>
+		</template>
 		<div class="p-4">
 			<div class="bg-secondary p-4">
 				<AjaxModalWrapper
diff --git a/src/composables/useLegacyGridUrl.js b/src/composables/useLegacyGridUrl.js
index b3e25a632..3d72d8141 100644
--- a/src/composables/useLegacyGridUrl.js
+++ b/src/composables/useLegacyGridUrl.js
@@ -35,7 +35,10 @@ export function useLegacyGridUrl({
 		return `${baseUrl}${queryParamsString.value}`;
 	});
 
-	function openLegacyModal({title, closeOnFormSuccessId}, finishedCallback) {
+	function openLegacyModal(
+		{title, closeOnFormSuccessId, description},
+		finishedCallback,
+	) {
 		const {openSideModal} = useModal();
 
 		openSideModal(
@@ -45,6 +48,7 @@ export function useLegacyGridUrl({
 					title,
 					url,
 					closeOnFormSuccessId,
+					description,
 				},
 			},
 			{
diff --git a/src/managers/UserAccessManager/UserAccessManagerCellName.vue b/src/managers/UserAccessManager/UserAccessManagerCellName.vue
index bdcefc29c..a1b09e8f2 100644
--- a/src/managers/UserAccessManager/UserAccessManagerCellName.vue
+++ b/src/managers/UserAccessManager/UserAccessManagerCellName.vue
@@ -5,6 +5,12 @@
 		</span>
 
 		<Icon v-if="user.orcid" icon="Orcid" class="h-4 w-4" :inline="true" />
+		<Icon
+			v-if="user.disabled"
+			icon="DisableUser"
+			class="h-4 w-4 text-negative"
+			:inline="true"
+		/>
 	</TableCell>
 </template>
 
diff --git a/src/managers/UserAccessManager/UserAccessManagerCellStartDate.vue b/src/managers/UserAccessManager/UserAccessManagerCellStartDate.vue
index b5f68a293..3d3446db6 100644
--- a/src/managers/UserAccessManager/UserAccessManagerCellStartDate.vue
+++ b/src/managers/UserAccessManager/UserAccessManagerCellStartDate.vue
@@ -2,7 +2,11 @@
 	<TableCell>
 		<template v-for="(userGroups, i) in user.groups" :key="i">
 			<div class="flex flex-col">
-				{{ formatShortDate(userGroups?.startDate) }}
+				{{
+					!userGroups.dateEnd
+						? userGroups?.dateStart && formatShortDate(userGroups?.dateStart)
+						: ''
+				}}
 			</div>
 		</template>
 	</TableCell>
diff --git a/src/managers/UserAccessManager/UserAccessManagerCellUserGroups.vue b/src/managers/UserAccessManager/UserAccessManagerCellUserGroups.vue
index c9ac7a7db..84159786d 100644
--- a/src/managers/UserAccessManager/UserAccessManagerCellUserGroups.vue
+++ b/src/managers/UserAccessManager/UserAccessManagerCellUserGroups.vue
@@ -2,7 +2,7 @@
 	<TableCell>
 		<template v-for="(userGroups, i) in user.groups" :key="i">
 			<div class="flex flex-col">
-				{{ userGroups.name }}
+				{{ !userGroups.dateEnd ? userGroups.name : '' }}
 			</div>
 		</template>
 	</TableCell>
diff --git a/src/managers/UserAccessManager/useUserAccessManagerActions.js b/src/managers/UserAccessManager/useUserAccessManagerActions.js
index bf8843537..32b63a20c 100644
--- a/src/managers/UserAccessManager/useUserAccessManagerActions.js
+++ b/src/managers/UserAccessManager/useUserAccessManagerActions.js
@@ -36,25 +36,25 @@ export function useUserAccessManagerActions() {
 		if (getCurrentUserId() !== user.id) {
 			user.canLoginAs &&
 				actions.push({
-					label: t('grid.action.logInAs'),
+					label: t('grid.user.logInAs'),
 					icon: 'LoginAs',
 					name: Actions.USER_ACCESS_LOGIN_AS,
 				});
 
-			actions.push({
-				label: t('grid.action.remove'),
-				icon: 'Cancel',
-				name: Actions.USER_ACCESS_REMOVE_USER,
-				isWarnable: true,
-			});
+			if (user.groups.find((value) => value.dateEnd === null)) {
+				actions.push({
+					label: t('grid.user.remove'),
+					icon: 'Cancel',
+					name: Actions.USER_ACCESS_REMOVE_USER,
+					isWarnable: true,
+				});
+			}
 
 			actions.push({
-				label: user.disabled
-					? t('grid.action.enable')
-					: t('grid.action.disable'),
-				icon: 'DisableUser',
+				label: user.disabled ? t('grid.user.enable') : t('grid.user.disable'),
+				icon: user.disabled ? 'User' : 'DisableUser',
 				name: Actions.USER_ACCESS_DISABLE_USER,
-				isWarnable: true,
+				isWarnable: !user.disabled,
 			});
 
 			user.canMergeUser &&
@@ -89,10 +89,21 @@ export function useUserAccessManagerActions() {
 				enable: user.disabled ? '1' : '',
 			},
 		});
+		const currentRoles = user.groups.map((group) => group.name).join(', ');
 
-		openLegacyModal({title: t('grid.user.disable')}, (closeData) => {
-			finishedCallback();
-		});
+		openLegacyModal(
+			{
+				title: !user.disabled
+					? t('user.disabledModal.title', {fullName: user.fullName})
+					: t('user.enabledModal.title', {fullName: user.fullName}),
+				description: t('user.disabledModal.description', {
+					roles: currentRoles,
+				}),
+			},
+			(closeData) => {
+				finishedCallback();
+			},
+		);
 	}
 
 	const {openDialog, openDialogNetworkError} = useModal();
diff --git a/src/pages/userInvitation/UserInvitationDetailsFormStep.vue b/src/pages/userInvitation/UserInvitationDetailsFormStep.vue
index 7ac9b8a28..22ef3f4e1 100644
--- a/src/pages/userInvitation/UserInvitationDetailsFormStep.vue
+++ b/src/pages/userInvitation/UserInvitationDetailsFormStep.vue
@@ -1,4 +1,15 @@
 <template>
+	<div
+		v-if="store.invitationPayload.disabled"
+		class="m-8 border-x border-b border-t border-light bg-secondary p-4"
+	>
+		<h2 class="text-xl-bold text-heading">
+			{{ t('userInvitation.user.disableTitle') }}
+		</h2>
+		<p class="text-base-normal text-secondary">
+			{{ t('userInvitation.user.disableMessage') }}
+		</p>
+	</div>
 	<div v-if="store.invitationPayload.userId === null">
 		<div v-if="Object.keys(store.errors).length" class="p-4">
 			<FormErrorSummary :errors="store.errors" />
diff --git a/src/pages/userInvitation/UserInvitationPageStore.js b/src/pages/userInvitation/UserInvitationPageStore.js
index 82a65e97d..16ac45a09 100644
--- a/src/pages/userInvitation/UserInvitationPageStore.js
+++ b/src/pages/userInvitation/UserInvitationPageStore.js
@@ -23,6 +23,7 @@ export const useUserInvitationPageStore = defineComponentStore(
 		const updatedPayload = ref({});
 		const invitationType = ref(pageInitConfig.invitationType);
 		const invitationMode = ref(pageInitConfig.invitationMode);
+		const detectChanges = ref(false);
 
 		function updatePayload(fieldName, value, initialValue = true) {
 			invitationPayload.value[fieldName] = value;
@@ -267,6 +268,7 @@ export const useUserInvitationPageStore = defineComponentStore(
 			await createInvitation();
 
 			if (validationError.value) {
+				delete validationError.value.errors['userId'];
 				errors.value = validationError.value.errors;
 			} else {
 				errors.value = [];
@@ -299,7 +301,27 @@ export const useUserInvitationPageStore = defineComponentStore(
 		}
 
 		const {redirectToPage} = useUrl('management/settings/access');
-		const isSubmitting = ref(false);
+		const isSubmitting = ref(
+			invitationMode.value === 'editUser'
+				? true
+				: invitationPayload.value.disabled,
+		);
+
+		/**
+		 * change isSubmitting value based on
+		 * user disable or not for disable submit button
+		 */
+		watch(
+			invitationPayload,
+			async (newVal, oldVal) => {
+				isSubmitting.value = invitationPayload.value.disabled;
+				if (invitationPayload.value.userGroupsToAdd.length === 0) {
+					isSubmitting.value = true;
+				}
+				detectChanges.value = true;
+			},
+			{deep: true},
+		);
 		/** Submit invitation */
 		async function submitInvitation() {
 			await updateInvitation();
@@ -336,28 +358,35 @@ export const useUserInvitationPageStore = defineComponentStore(
 		}
 
 		function cancel() {
-			openDialog({
-				name: 'cancel',
-				title: t('invitation.cancelInvite.title'),
-				message: t('userInvitation.cancel.message'),
-				actions: [
-					{
-						label: t('invitation.cancelInvite.actionName'),
-						isWarnable: true,
-						callback: (close) => {
-							redirectToPage();
-						},
-					},
-					{
-						label: t('userInvitation.cancel.goBack'),
-						callback: (close) => {
-							redirectToPage();
-							close();
-						},
-					},
-				],
-				modalStyle: 'negative',
-			});
+			if (detectChanges.value) {
+				if (invitationMode.value === 'editUser') {
+					confirm(t('form.dataHasChanged')) ? redirectToPage() : '';
+				} else {
+					openDialog({
+						name: 'cancel',
+						title: t('invitation.cancelInvite.title'),
+						message: t('userInvitation.cancel.message'),
+						actions: [
+							{
+								label: t('invitation.cancelInvite.actionName'),
+								isWarnable: true,
+								callback: (close) => {
+									redirectToPage();
+								},
+							},
+							{
+								label: t('userInvitation.cancel.goBack'),
+								callback: (close) => {
+									close();
+								},
+							},
+						],
+						modalStyle: 'negative',
+					});
+				}
+			} else {
+				redirectToPage();
+			}
 		}
 
 		const registeredActionsForSteps = {};
diff --git a/src/pages/userInvitation/UserInvitationSearchFormStep.vue b/src/pages/userInvitation/UserInvitationSearchFormStep.vue
index 672bdb036..9a547fd2e 100644
--- a/src/pages/userInvitation/UserInvitationSearchFormStep.vue
+++ b/src/pages/userInvitation/UserInvitationSearchFormStep.vue
@@ -1,28 +1,10 @@
 <template>
 	<div class="space-y-4 p-8">
 		<FieldText
-			:label="t('about.contact.email')"
-			:value="fields.email"
-			:description="t('userInvitation.emailField.description')"
-			name="email"
-			size="large"
-			@change="updateField"
-		/>
-		<p>or</p>
-		<FieldText
-			:label="t('user.username')"
-			:value="fields.username"
-			:description="t('userInvitation.usernameField.description')"
-			name="username"
-			size="large"
-			@change="updateField"
-		/>
-		<p>or</p>
-		<FieldText
-			:label="t('user.orcid')"
-			:value="fields.orcid"
-			:description="t('userInvitation.orcidField.description')"
-			name="orcid"
+			:label="t('userInvitation.searchField')"
+			:value="fields.search"
+			:description="t('userInvitation.searchField.description')"
+			name="search"
 			size="large"
 			@change="updateField"
 		/>
@@ -50,25 +32,14 @@ const store = useUserInvitationPageStore();
 const {t} = useLocalize();
 store.registerActionForStepId('searchUser', searchUser);
 
-const fields = ref({email: '', username: '', orcid: ''});
+const fields = ref({search: ''});
 
 function updateField(fieldName, b, fieldValue) {
 	fields.value[fieldName] = fieldValue;
 }
 
 const searchPhrase = computed(() => {
-	let searchText = '';
-	if (fields.value.email) {
-		searchText = fields.value.email.trim() + ' ';
-	}
-	if (fields.value.orcid) {
-		searchText = searchText + fields.value.orcid.trim() + ' ';
-	}
-	if (fields.value.username) {
-		searchText = searchText + fields.value.username.trim();
-	}
-
-	return searchText;
+	return fields.value.search.trim();
 });
 
 async function searchUser() {
@@ -82,21 +53,23 @@ async function searchUser() {
 		if (userData.value.items.length > 0) {
 			let user = {};
 			user = userData.value.items.find(
-				(value) => value.email === fields.value.email.trim(), // check provided email is exact match
+				(value) => value.email === fields.value.search.trim(), // check provided email is exact match
 			);
 			user
 				? user
 				: (user = userData.value.items.find(
-						(value) => value.userName === fields.value.username.trim(), // check provided username is exact match
+						(value) => value.userName === fields.value.search.trim(), // check provided username is exact match
 					));
 			user
 				? user
 				: (user = userData.value.items.find(
-						(value) => value.orcid === fields.value.orcid.trim(), // check provided orcid is exact match
+						(value) => value.orcid === fields.value.search.trim(), // check provided orcid is exact match
 					));
 
 			if (!user) {
-				store.updatePayload('inviteeEmail', fields.value.email.trim());
+				valid(fields.value.search.trim())
+					? store.updatePayload('inviteeEmail', fields.value.search.trim())
+					: '';
 				store.userSearch.message = t('userInvitation.search.userNotFound');
 				store.userSearch.class = 'font-bold text-negative';
 			} else {
@@ -108,11 +81,14 @@ async function searchUser() {
 				store.updatePayload('currentUserGroups', user.groups);
 				store.updatePayload('affiliation', user.affiliation);
 				store.updatePayload('country', user.country);
+				store.updatePayload('disabled', user.disabled);
 				store.userSearch.message = t('userInvitation.search.userFound');
 				store.userSearch.class = 'font-bold text-success';
 			}
 		} else {
-			store.updatePayload('inviteeEmail', fields.value.email.trim());
+			valid(fields.value.search.trim())
+				? store.updatePayload('inviteeEmail', fields.value.search.trim())
+				: '';
 			store.userSearch.message = t('userInvitation.search.userNotFound');
 			store.userSearch.class = 'font-bold text-negative';
 		}
@@ -121,5 +97,10 @@ async function searchUser() {
 		store.errors.error = t('invitation.searchForm.emptyError');
 		return false;
 	}
+
+	function valid(email) {
+		const pattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+		return pattern.test(email);
+	}
 }
 </script>
diff --git a/src/pages/userInvitation/UserInvitationUserGroupsTable.vue b/src/pages/userInvitation/UserInvitationUserGroupsTable.vue
index 03eaaeb0c..56b0a902c 100644
--- a/src/pages/userInvitation/UserInvitationUserGroupsTable.vue
+++ b/src/pages/userInvitation/UserInvitationUserGroupsTable.vue
@@ -55,79 +55,84 @@
 					</div>
 				</TableCell>
 			</TableRow>
-			<TableRow
-				v-for="(userGroupToAdd, index) in allUserGroupsToAdd"
-				:key="index"
-			>
-				<TableCell>
-					<FieldSelect
-						name="userGroupId"
-						:label="t('invitation.role.selectRole')"
-						:is-required="true"
-						:value="userGroupToAdd.userGroupId"
-						:options="availableUserGroups"
-						:all-errors="{
-							userGroupId:
-								userGroupErrors['userGroupsToAdd.' + index + '.userGroupId'],
-						}"
-						class="userInvitation__roleSelect"
-						@change="
-							(fieldName, propName, newValue, localeKey) =>
-								updateUserGroup(index, fieldName, newValue)
-						"
-					/>
-				</TableCell>
-				<TableCell>
-					<FieldText
-						name="dateStart"
-						:label="t('invitation.role.dateStart')"
-						input-type="date"
-						:is-required="true"
-						:value="userGroupToAdd.dateStart"
-						:all-errors="{
-							dateStart:
-								userGroupErrors['userGroupsToAdd.' + index + '.dateStart'],
-						}"
-						@change="
-							(fieldName, propName, newValue, localeKey) =>
-								updateUserGroup(index, fieldName, newValue)
-						"
-					/>
-				</TableCell>
-				<TableCell>---</TableCell>
-				<TableCell>
-					<FieldSelect
-						name="masthead"
-						:label="t('invitation.role.masthead')"
-						:is-required="true"
-						:value="userGroupToAdd.masthead"
-						:options="[
-							{label: t('invitation.masthead.show'), value: true},
-							{label: t('invitation.masthead.hidden'), value: false},
-						]"
-						:all-errors="{
-							masthead:
-								userGroupErrors['userGroupsToAdd.' + index + '.masthead'],
-						}"
-						@change="
-							(fieldName, propName, newValue, localeKey) =>
-								updateUserGroup(index, fieldName, newValue)
-						"
-					/>
-				</TableCell>
-				<TableCell>
-					<PkpButton
-						v-if="index > 0"
-						:is-warnable="true"
-						@click="removeInvitedUserGroup(index)"
-					>
-						{{ t('invitation.role.removeRole.button') }}
-					</PkpButton>
-				</TableCell>
-			</TableRow>
+			<template v-if="!store.invitationPayload.disabled">
+				<TableRow
+					v-for="(userGroupToAdd, index) in allUserGroupsToAdd"
+					:key="index"
+				>
+					<TableCell>
+						<FieldSelect
+							name="userGroupId"
+							:label="t('invitation.role.selectRole')"
+							:is-required="true"
+							:value="userGroupToAdd.userGroupId"
+							:options="availableUserGroups"
+							:all-errors="{
+								userGroupId:
+									userGroupErrors['userGroupsToAdd.' + index + '.userGroupId'],
+							}"
+							class="userInvitation__roleSelect"
+							@change="
+								(fieldName, propName, newValue, localeKey) =>
+									updateUserGroup(index, fieldName, newValue)
+							"
+						/>
+					</TableCell>
+					<TableCell>
+						<FieldText
+							name="dateStart"
+							:label="t('invitation.role.dateStart')"
+							input-type="date"
+							:is-required="true"
+							:value="userGroupToAdd.dateStart"
+							:all-errors="{
+								dateStart:
+									userGroupErrors['userGroupsToAdd.' + index + '.dateStart'],
+							}"
+							@change="
+								(fieldName, propName, newValue, localeKey) =>
+									updateUserGroup(index, fieldName, newValue)
+							"
+						/>
+					</TableCell>
+					<TableCell>---</TableCell>
+					<TableCell>
+						<FieldSelect
+							name="masthead"
+							:label="t('invitation.role.masthead')"
+							:is-required="true"
+							:value="userGroupToAdd.masthead"
+							:options="[
+								{label: t('invitation.masthead.show'), value: true},
+								{label: t('invitation.masthead.hidden'), value: false},
+							]"
+							:all-errors="{
+								masthead:
+									userGroupErrors['userGroupsToAdd.' + index + '.masthead'],
+							}"
+							@change="
+								(fieldName, propName, newValue, localeKey) =>
+									updateUserGroup(index, fieldName, newValue)
+							"
+						/>
+					</TableCell>
+					<TableCell>
+						<PkpButton
+							v-if="index > 0"
+							:is-warnable="true"
+							@click="removeInvitedUserGroup(index)"
+						>
+							{{ t('invitation.role.removeRole.button') }}
+						</PkpButton>
+					</TableCell>
+				</TableRow>
+			</template>
 		</TableBody>
 		<template #bottom-controls>
-			<PkpButton @click="addUserGroup()">
+			<PkpButton
+				:is-disabled="store.invitationPayload.disabled"
+				@click="addUserGroup()"
+			>
 				{{ t('invitation.role.addRole.button') }}
 			</PkpButton>
 		</template>
diff --git a/src/pages/userInvitation/mocks/pageInitConfig.js b/src/pages/userInvitation/mocks/pageInitConfig.js
index aa842ceac..69dd444e5 100644
--- a/src/pages/userInvitation/mocks/pageInitConfig.js
+++ b/src/pages/userInvitation/mocks/pageInitConfig.js
@@ -48,6 +48,7 @@ export default {
 		givenName: '',
 		familyName: '',
 		orcidValidation: false,
+		disabled: false,
 		userGroupsToAdd: [{userGroupId: null, dateStart: null, masthead: null}],
 		currentUserGroups: [],
 		userGroupsToRemove: [],
@@ -62,7 +63,7 @@ export default {
 			name: 'Search User',
 			stepLabel: '{$step} - Search User',
 			description:
-				'Search for the user using their email address, username or ORCID iD. Enter at least one details to get started. If user does not exist, ypu can invite them to take up roles and be a part of your journal. If the user already exist in the system, you can view user information and invite to take a additional roles.',
+				'If the user does not exist, you can invite them to take on roles and become part of your journal. If the user already exists in the system, you can view their information and invite them to take on additional roles.',
 			nextButtonLabel: 'Search user (t)',
 			skipInvitationUpdate: true,
 			sections: [