diff --git a/admin/src/WorkflowUI.js b/admin/src/WorkflowUI.js
index c4cf0f3fb..1a76d202a 100644
--- a/admin/src/WorkflowUI.js
+++ b/admin/src/WorkflowUI.js
@@ -292,7 +292,13 @@ class WorkflowUI extends Component {
 						const recipientValue  = recipient.value
 							? { value: recipientObject.multi ? recipient.value : recipient.value[0] }
 							: {};
-						return Object.assign( {}, recipientObject, recipientValue );
+						let recipientUsers = {};
+
+						if ( recipient.users && recipient.users.length > 0 ) {
+							recipientUsers = { users: recipientObject.multi ? recipient.users : recipient.users[0] };
+						}
+
+						return Object.assign( {}, recipientObject, recipientValue, recipientUsers );
 					} ),
 					destinations:   data.destinations.map( destination => {
 						const destObject = HM.Workflows.Destinations.find( dest => dest.id === destination.id );
@@ -564,7 +570,11 @@ class WorkflowUI extends Component {
 									.then( response => response.json() )
 									.then( data => ({ options: data }) )
 								}
-								value={recipient.value}
+								value={
+									recipient.multi
+										? ( recipient.users || [] ).filter( user => recipient.value.includes( String( user.id ) ) )
+										: recipient.users
+								}
 								labelKey={recipient.endpoint.labelKey || 'name'}
 								valueKey={recipient.endpoint.valueKey || 'id'}
 								onChange={option => this.setState( {
@@ -572,13 +582,31 @@ class WorkflowUI extends Component {
 										if ( rec.id !== recipient.id ) {
 											return rec;
 										}
-										return Object.assign( {}, rec, {
-											value: rec.multi
-												       ? option.map( opt => String( opt[ recipient.endpoint.valueKey || 'id' ] ) )
-												       : String( option[ recipient.endpoint.valueKey || 'id' ] )
-										} );
-									} )
-								} )}
+
+										// Make sure to only set value if option is not null or empty.
+										const selectedValue = option ?
+											rec.multi
+												? option.map(opt => String(opt[recipient.endpoint.valueKey || 'id']))
+												: String( option[recipient.endpoint.valueKey || 'id'] )
+											: '';
+
+										// Handle single or multi-select options
+										const selectedUsers = rec.multi ? option : [option];
+
+										// Merge with the existing users
+										const mergedItems = [...(rec.users || []), ...( selectedUsers || [])].reduce( ( acc, current ) => {
+											if ( ! acc.some(item => item.id === current.id ) ) {
+												acc.push( current );
+											}
+											return acc;
+										}, [] );
+
+										return Object.assign({}, rec, {
+											value: selectedValue,
+											users: rec.multi ? mergedItems : mergedItems[0]
+										});
+									})
+								})}
 							/>}
 						</Fieldset>
 					</Form>
diff --git a/inc/class-rest-workflows-controller.php b/inc/class-rest-workflows-controller.php
index e711fb249..ea074d68f 100644
--- a/inc/class-rest-workflows-controller.php
+++ b/inc/class-rest-workflows-controller.php
@@ -85,7 +85,30 @@ public function register_routes() {
 
 		register_rest_field( 'hm_workflow', 'recipients', [
 			'get_callback' => function ( $post ) {
-				return get_post_meta( $post['id'], 'recipients', true ) ?: [];
+				$recipients = get_post_meta( $post['id'], 'recipients', true );
+
+				// Loop through each recipient and set the 'users' field if field type is 'user'
+				foreach ( $recipients as &$recipient ) {
+					if ( isset( $recipient['id'] ) && $recipient['id'] === 'user' ) {
+						$user_ids = isset( $recipient['value'] ) ? $recipient['value'] : [];
+
+						if ( ! empty( $user_ids ) && is_array( $user_ids ) ) {
+							$users = get_users( [
+								'include' => $user_ids,
+							] );
+
+							// Prepare the formatted response to include only 'id' and 'name'
+							$recipient['users'] = array_map( function ( $user ) {
+								return [
+									'id'   => $user->ID,
+									'name' => $user->display_name,
+								];
+							}, $users );
+						}
+					}
+				}
+
+				return $recipients ?: [];
 			},
 			'update_callback' => function ( $value, $post ) {
 				update_post_meta( $post->ID, 'recipients', $value );