diff --git a/apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/adapters/Settings.ts b/apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/adapters/Settings.ts
index 31126a71b20e..eb0ed192a282 100644
--- a/apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/adapters/Settings.ts
+++ b/apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/adapters/Settings.ts
@@ -128,6 +128,7 @@ export class RocketChatSettingsAdapter {
 					i18nLabel: 'Federation_Matrix_enabled',
 					i18nDescription: 'Federation_Matrix_enabled_desc',
 					alert: 'Federation_Matrix_Enabled_Alert',
+					public: true,
 				});
 
 				const uniqueId = settings.get('uniqueID') || uuidv4().slice(0, 15).replace(new RegExp('-', 'g'), '_');
diff --git a/apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/slash-commands/index.ts b/apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/slash-commands/index.ts
index cb7c734479d6..46b7e4425b89 100644
--- a/apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/slash-commands/index.ts
+++ b/apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/slash-commands/index.ts
@@ -32,7 +32,7 @@ const executeSlashCommand = async (
 		return;
 	}
 
-	const [command, ...params] = stringParams.split(' ');
+	const [command, ...params] = stringParams.trim().split(' ');
 	const [rawUserId] = params;
 	const currentUserId = Meteor.userId();
 	if (!currentUserId || !commands[command]) {
diff --git a/apps/meteor/app/lib/server/functions/createDirectRoom.ts b/apps/meteor/app/lib/server/functions/createDirectRoom.ts
index 830a17467f1d..0e3c6c12d6fb 100644
--- a/apps/meteor/app/lib/server/functions/createDirectRoom.ts
+++ b/apps/meteor/app/lib/server/functions/createDirectRoom.ts
@@ -2,8 +2,9 @@ import { AppsEngineException } from '@rocket.chat/apps-engine/definition/excepti
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import type { IUser } from '@rocket.chat/core-typings';
-import { Users, Subscriptions, Rooms } from '@rocket.chat/models';
+import { Subscriptions } from '@rocket.chat/models';
 
+import { Users, Rooms } from '../../../models/server';
 import { Apps } from '../../../apps/server';
 import { callbacks } from '../../../../lib/callbacks';
 import { settings } from '../../../settings/server';
diff --git a/apps/meteor/client/components/RoomIcon/RoomIcon.tsx b/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
index 22bcd3cde2d3..888dcb6d3866 100644
--- a/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
+++ b/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
@@ -1,8 +1,8 @@
-import { IRoom, isDirectMessageRoom, isOmnichannelRoom } from '@rocket.chat/core-typings';
+import { IRoom, isOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement } from 'react';
+import React, { ComponentProps, ReactElement, isValidElement } from 'react';
 
-import { ReactiveUserStatus } from '../UserStatus';
+import { useRoomIcon } from '../../hooks/useRoomIcon';
 import { OmnichannelRoomIcon } from './OmnichannelRoomIcon';
 
 export const RoomIcon = ({
@@ -14,33 +14,19 @@ export const RoomIcon = ({
 	size?: ComponentProps<typeof Icon>['size'];
 	placement: 'sidebar' | 'default';
 }): ReactElement | null => {
-	if (room.prid) {
-		return <Icon name='baloons' size={size} />;
-	}
-
-	if (room.teamMain) {
-		return <Icon name={room.t === 'p' ? 'team-lock' : 'team'} size={size} />;
-	}
+	const iconPropsOrReactNode = useRoomIcon(room);
 
 	if (isOmnichannelRoom(room)) {
 		return <OmnichannelRoomIcon placement={placement} room={room} size={size} />;
 	}
-	if (isDirectMessageRoom(room)) {
-		if (room.uids && room.uids.length > 2) {
-			return <Icon name='balloon' size={size} />;
-		}
-		if (room.uids && room.uids.length > 0) {
-			return <ReactiveUserStatus uid={room.uids.filter((uid) => uid !== room.u._id)[0] || room.u._id} />;
-		}
-		return <Icon name='at' size={size} />;
+
+	if (isValidElement(iconPropsOrReactNode)) {
+		return iconPropsOrReactNode;
 	}
 
-	switch (room.t) {
-		case 'p':
-			return <Icon name='hashtag-lock' size={size} />;
-		case 'c':
-			return <Icon name='hash' size={size} />;
-		default:
-			return null;
+	if (!iconPropsOrReactNode) {
+		return null;
 	}
+
+	return <Icon {...iconPropsOrReactNode} size={size} />;
 };
diff --git a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated.tsx b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated.tsx
new file mode 100644
index 000000000000..470331f3803c
--- /dev/null
+++ b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated.tsx
@@ -0,0 +1,89 @@
+import { MultiSelectFiltered, Icon, Box, Chip } from '@rocket.chat/fuselage';
+import type { Options } from '@rocket.chat/fuselage';
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import React, { memo, ReactElement, useState, ComponentProps } from 'react';
+import { useQuery } from 'react-query';
+
+import UserAvatar from '../avatar/UserAvatar';
+import renderOptions from './UserAutoCompleteMultipleOptions';
+
+type UserAutoCompleteMultipleFederatedProps = {
+	onChange: (value: Array<string>) => void;
+	value: Array<string>;
+	placeholder?: string;
+};
+
+export type UserAutoCompleteOptionType = {
+	name: string;
+	username: string;
+	_federated?: boolean;
+};
+
+type UserAutoCompleteOptions = {
+	[k: string]: UserAutoCompleteOptionType;
+};
+
+const matrixRegex = new RegExp('(.*:.*)', 'gi');
+
+const UserAutoCompleteMultipleFederated = ({
+	onChange,
+	value,
+	placeholder,
+	...props
+}: UserAutoCompleteMultipleFederatedProps): ReactElement => {
+	const [filter, setFilter] = useState('');
+	const [selectedCache, setSelectedCache] = useState<UserAutoCompleteOptions>({});
+
+	const debouncedFilter = useDebouncedValue(filter, 1000);
+	const getUsers = useEndpoint('GET', '/v1/users.autocomplete');
+
+	const { data } = useQuery(['users.autocomplete', debouncedFilter], async () => {
+		const users = await getUsers({ selector: JSON.stringify({ term: debouncedFilter }) });
+		const options = users.items.map((item): [string, UserAutoCompleteOptionType] => [item.username, item]);
+
+		// Add extra option if filter text matches `username:server`
+		// Used to add federated users that do not exist yet
+		if (matrixRegex.test(debouncedFilter)) {
+			options.unshift([debouncedFilter, { name: debouncedFilter, username: debouncedFilter, _federated: true }]);
+		}
+
+		return options;
+	});
+
+	const options = data || [];
+
+	const onAddSelected: ComponentProps<typeof Options>['onSelect'] = ([value]) => {
+		const cachedOption = options.find(([curVal]) => curVal === value)?.[1];
+		if (!cachedOption) {
+			throw new Error('UserAutoCompleteMultiple - onAddSelected - failed to cache option');
+		}
+		setSelectedCache({ ...selectedCache, [value]: cachedOption });
+	};
+
+	return (
+		<MultiSelectFiltered
+			placeholder={placeholder}
+			value={value}
+			onChange={onChange}
+			filter={filter}
+			setFilter={setFilter}
+			renderSelected={({ value, onMouseDown }: { value: string; onMouseDown: () => void }): ReactElement => {
+				const currentCachedOption = selectedCache[value];
+
+				return (
+					<Chip key={value} {...props} height='x20' onMouseDown={onMouseDown} mie='x4' mb='x2'>
+						{currentCachedOption._federated ? <Icon size='x20' name='globe' /> : <UserAvatar size='x20' username={value} />}
+						<Box is='span' margin='none' mis='x4'>
+							{currentCachedOption.name || currentCachedOption.username}
+						</Box>
+					</Chip>
+				);
+			}}
+			renderOptions={renderOptions(options, onAddSelected)}
+			options={options.concat(Object.entries(selectedCache)).map(([, item]) => [item.username, item.name || item.username])}
+		/>
+	);
+};
+
+export default memo(UserAutoCompleteMultipleFederated);
diff --git a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOption.tsx b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOption.tsx
new file mode 100644
index 000000000000..e8be27f28c34
--- /dev/null
+++ b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOption.tsx
@@ -0,0 +1,31 @@
+import { IUser } from '@rocket.chat/core-typings';
+import { Option, OptionDescription } from '@rocket.chat/fuselage';
+import React, { ReactElement } from 'react';
+
+import UserAvatar from '../avatar/UserAvatar';
+
+type UserAutoCompleteMultipleOptionProps = {
+	label: {
+		_federated?: boolean;
+	} & Pick<IUser, 'username' | 'name'>;
+};
+
+const UserAutoCompleteMultipleOption = ({ label, ...props }: UserAutoCompleteMultipleOptionProps): ReactElement => {
+	const { name, username, _federated } = label;
+
+	return (
+		<Option
+			{...props}
+			avatar={_federated ? undefined : <UserAvatar username={username || ''} size='x20' />}
+			icon={_federated ? 'globe' : undefined}
+			key={username}
+			label={
+				<>
+					{name || username} {!_federated && <OptionDescription>({username})</OptionDescription>}
+				</>
+			}
+		/>
+	);
+};
+
+export default UserAutoCompleteMultipleOption;
diff --git a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOptions.tsx b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOptions.tsx
new file mode 100644
index 000000000000..5c20d5ff3e62
--- /dev/null
+++ b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOptions.tsx
@@ -0,0 +1,31 @@
+import { Options } from '@rocket.chat/fuselage';
+import React, { forwardRef, ComponentProps, RefAttributes, ReactElement, Ref } from 'react';
+
+import { UserAutoCompleteOptionType } from './UserAutoCompleteMultipleFederated';
+import UserAutoCompleteMultipleOption from './UserAutoCompleteMultipleOption';
+
+type Options = Array<[UserAutoCompleteOptionType['username'], UserAutoCompleteOptionType]>;
+
+const renderOptions = (
+	options: Options,
+	onSelect: ComponentProps<typeof Options>['onSelect'],
+): ((props: ComponentProps<typeof Options> & RefAttributes<HTMLElement>) => ReactElement | null) =>
+	forwardRef(function UserAutoCompleteMultipleOptions(
+		{ onSelect: _onSelect, ...props }: ComponentProps<typeof Options>,
+		ref: Ref<HTMLElement>,
+	): ReactElement {
+		return (
+			<Options
+				{...props}
+				options={options}
+				onSelect={(val): void => {
+					onSelect(val);
+					_onSelect(val);
+				}}
+				ref={ref}
+				renderItem={UserAutoCompleteMultipleOption}
+			/>
+		);
+	});
+
+export default renderOptions;
diff --git a/apps/meteor/client/hooks/usePreventProgation.ts b/apps/meteor/client/hooks/usePreventPropagation.ts
similarity index 71%
rename from apps/meteor/client/hooks/usePreventProgation.ts
rename to apps/meteor/client/hooks/usePreventPropagation.ts
index d9e0176c89f4..d14b10dbf39d 100644
--- a/apps/meteor/client/hooks/usePreventProgation.ts
+++ b/apps/meteor/client/hooks/usePreventPropagation.ts
@@ -1,7 +1,7 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { MouseEvent } from 'react';
 
-export const usePreventProgation = (fn: (e: MouseEvent) => void): ((e: MouseEvent) => void) => {
+export const usePreventPropagation = (fn?: (e: MouseEvent) => void): ((e: MouseEvent) => void) => {
 	const preventClickPropagation = useMutableCallback((e): void => {
 		e.stopPropagation();
 		fn?.(e);
diff --git a/apps/meteor/client/hooks/useRoomIcon.tsx b/apps/meteor/client/hooks/useRoomIcon.tsx
index 3f73108b6540..fdaf9c5a61ab 100644
--- a/apps/meteor/client/hooks/useRoomIcon.tsx
+++ b/apps/meteor/client/hooks/useRoomIcon.tsx
@@ -1,4 +1,5 @@
 import type { IRoom } from '@rocket.chat/core-typings';
+import { isIRoomFederated, isDirectMessageRoom } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
 import React, { ComponentProps, ReactElement } from 'react';
 
@@ -14,6 +15,10 @@ export const colors = {
 export const useRoomIcon = (
 	room: Pick<IRoom, 't' | 'prid' | 'teamMain' | 'uids' | 'u'>,
 ): ReactElement | ComponentProps<typeof Icon> | null => {
+	if (isIRoomFederated(room)) {
+		return { name: 'globe' };
+	}
+
 	if (room.prid) {
 		return { name: 'baloons' };
 	}
@@ -22,7 +27,7 @@ export const useRoomIcon = (
 		return { name: room.t === 'p' ? 'team-lock' : 'team' };
 	}
 
-	if (room.t === 'd') {
+	if (isDirectMessageRoom(room)) {
 		if (room.uids && room.uids.length > 2) {
 			return { name: 'balloon' };
 		}
diff --git a/apps/meteor/client/sidebar/header/CreateChannel.tsx b/apps/meteor/client/sidebar/header/CreateChannel.tsx
index 2ac31a086425..f8feee02b5b0 100644
--- a/apps/meteor/client/sidebar/header/CreateChannel.tsx
+++ b/apps/meteor/client/sidebar/header/CreateChannel.tsx
@@ -1,18 +1,20 @@
 import { Box, Modal, ButtonGroup, Button, TextInput, Icon, Field, ToggleSwitch, FieldGroup } from '@rocket.chat/fuselage';
 import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetting, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting, useMethod, useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
 import React, { ReactElement, useEffect, useMemo, useState } from 'react';
 
-import UserAutoCompleteMultiple from '../../components/UserAutoCompleteMultiple';
+import { useHasLicense } from '../../../ee/client/hooks/useHasLicense';
+import UserAutoCompleteMultipleFederated from '../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
 
 export type CreateChannelProps = {
 	values: {
 		name: string;
 		type: boolean;
+		federated?: boolean;
 		readOnly?: boolean;
 		encrypted?: boolean;
 		broadcast?: boolean;
-		users?: string[];
+		users: string[];
 		description?: string;
 	};
 	handlers: {
@@ -20,24 +22,36 @@ export type CreateChannelProps = {
 		handleDescription?: () => void;
 		handleEncrypted?: () => void;
 		handleReadOnly?: () => void;
+		handleUsers: (users: Array<string>) => void;
 	};
 	hasUnsavedChanges: boolean;
-	onChangeUsers: (value: string, action: 'remove' | undefined) => void;
 	onChangeType: React.FormEventHandler<HTMLElement>;
 	onChangeBroadcast: React.FormEventHandler<HTMLElement>;
+	onChangeFederated: React.FormEventHandler<HTMLElement>;
 	canOnlyCreateOneType?: false | 'p' | 'c';
 	e2eEnabledForPrivateByDefault?: boolean;
 	onCreate: () => void;
 	onClose: () => void;
 };
+
+const getFederationHintKey = (licenseModule: ReturnType<typeof useHasLicense>, featureToggle: boolean): TranslationKey => {
+	if (licenseModule === 'loading' || !licenseModule) {
+		return 'error-this-is-an-ee-feature';
+	}
+	if (!featureToggle) {
+		return 'Federation_Matrix_Federated_Description_disabled';
+	}
+	return 'Federation_Matrix_Federated_Description';
+};
+
 const CreateChannel = ({
 	values,
 	handlers,
 	hasUnsavedChanges,
-	onChangeUsers,
 	onChangeType,
 	onChangeBroadcast,
 	canOnlyCreateOneType,
+	onChangeFederated,
 	e2eEnabledForPrivateByDefault,
 	onCreate,
 	onClose,
@@ -46,12 +60,17 @@ const CreateChannel = ({
 	const e2eEnabled = useSetting('E2E_Enable');
 	const namesValidation = useSetting('UTF8_Channel_Names_Validation');
 	const allowSpecialNames = useSetting('UI_Allow_room_names_with_special_chars');
+	const federationEnabled = useSetting('Federation_Matrix_enabled');
 	const channelNameExists = useMethod('roomNameExists');
 
 	const channelNameRegex = useMemo(() => new RegExp(`^${namesValidation}$`), [namesValidation]);
 
 	const [nameError, setNameError] = useState<string>();
 
+	const federatedModule = useHasLicense('federation');
+
+	const canUseFederation = federatedModule !== 'loading' && federatedModule && federationEnabled;
+
 	const checkName = useDebouncedCallback(
 		async (name: string) => {
 			setNameError(undefined);
@@ -126,6 +145,15 @@ const CreateChannel = ({
 							<ToggleSwitch checked={!!values.type} disabled={!!canOnlyCreateOneType} onChange={onChangeType} />
 						</Box>
 					</Field>
+					<Field>
+						<Box display='flex' justifyContent='space-between' alignItems='start'>
+							<Box display='flex' flexDirection='column' width='full'>
+								<Field.Label>{t('Federation_Matrix_Federated')}</Field.Label>
+								<Field.Description>{t(getFederationHintKey(federatedModule, Boolean(federationEnabled)))}</Field.Description>
+							</Box>
+							<ToggleSwitch checked={values.federated} onChange={onChangeFederated} disabled={!canUseFederation} />
+						</Box>
+					</Field>
 					<Field>
 						<Box display='flex' justifyContent='space-between' alignItems='start'>
 							<Box display='flex' flexDirection='column' width='full'>
@@ -145,7 +173,7 @@ const CreateChannel = ({
 								<Field.Label>{t('Encrypted')}</Field.Label>
 								<Field.Description>{values.type ? t('Encrypted_channel_Description') : t('Encrypted_not_available')}</Field.Description>
 							</Box>
-							<ToggleSwitch checked={values.encrypted} disabled={e2edisabled} onChange={handlers.handleEncrypted} />
+							<ToggleSwitch checked={values.encrypted} disabled={e2edisabled || values.federated} onChange={handlers.handleEncrypted} />
 						</Box>
 					</Field>
 					<Field>
@@ -154,12 +182,12 @@ const CreateChannel = ({
 								<Field.Label>{t('Broadcast')}</Field.Label>
 								<Field.Description>{t('Broadcast_channel_Description')}</Field.Description>
 							</Box>
-							<ToggleSwitch checked={values.broadcast} onChange={onChangeBroadcast} />
+							<ToggleSwitch checked={values.broadcast} onChange={onChangeBroadcast} disabled={!!values.federated} />
 						</Box>
 					</Field>
 					<Field>
 						<Field.Label>{`${t('Add_members')} (${t('optional')})`}</Field.Label>
-						<UserAutoCompleteMultiple value={values.users} onChange={onChangeUsers} />
+						<UserAutoCompleteMultipleFederated value={values.users} onChange={handlers.handleUsers} />
 					</Field>
 				</FieldGroup>
 			</Modal.Content>
diff --git a/apps/meteor/client/sidebar/header/CreateChannelWithData.tsx b/apps/meteor/client/sidebar/header/CreateChannelWithData.tsx
index eeb1c46f34cb..9d42ac751846 100644
--- a/apps/meteor/client/sidebar/header/CreateChannelWithData.tsx
+++ b/apps/meteor/client/sidebar/header/CreateChannelWithData.tsx
@@ -1,7 +1,7 @@
 import { RoomType } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetting, usePermission } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement, useCallback, useMemo } from 'react';
+import React, { memo, ReactElement, useCallback, useMemo, ComponentProps } from 'react';
 
 import { useEndpointActionExperimental } from '../../hooks/useEndpointActionExperimental';
 import { useForm } from '../../hooks/useForm';
@@ -22,6 +22,7 @@ type UseFormValues = {
 	readOnly: boolean;
 	encrypted: boolean;
 	broadcast: boolean;
+	federated: boolean;
 };
 
 const CreateChannelWithData = ({ onClose, teamId = '', reload }: CreateChannelWithDataProps): ReactElement => {
@@ -48,21 +49,12 @@ const CreateChannelWithData = ({ onClose, teamId = '', reload }: CreateChannelWi
 		readOnly: false,
 		encrypted: e2eEnabledForPrivateByDefault ?? false,
 		broadcast: false,
+		federated: false,
 	};
 	const { values, handlers, hasUnsavedChanges } = useForm(initialValues);
 
-	const { users, name, description, type, readOnly, broadcast, encrypted } = values as UseFormValues;
-	const { handleUsers, handleEncrypted, handleType, handleBroadcast, handleReadOnly } = handlers;
-
-	const onChangeUsers = useMutableCallback((value, action) => {
-		if (!action) {
-			if (users.includes(value)) {
-				return;
-			}
-			return handleUsers([...users, value]);
-		}
-		handleUsers(users.filter((current) => current !== value));
-	});
+	const { users, name, description, type, readOnly, broadcast, encrypted, federated } = values as UseFormValues;
+	const { handleEncrypted, handleType, handleBroadcast, handleReadOnly, handleFederated } = handlers;
 
 	const onChangeType = useMutableCallback((value) => {
 		handleEncrypted(!value);
@@ -75,6 +67,20 @@ const CreateChannelWithData = ({ onClose, teamId = '', reload }: CreateChannelWi
 		return handleBroadcast(value);
 	});
 
+	const onChangeFederated = useMutableCallback((value) => {
+		// if room is federated, it cannot be encrypted
+		if (encrypted && value) {
+			handleEncrypted(false);
+		}
+
+		// if room is federated, it cannot be broadcast
+		if (broadcast && value) {
+			handleBroadcast(false);
+		}
+
+		return handleFederated(value);
+	});
+
 	const onCreate = useCallback(async () => {
 		const goToRoom = (rid: string): void => {
 			goToRoomById(rid);
@@ -88,6 +94,7 @@ const CreateChannelWithData = ({ onClose, teamId = '', reload }: CreateChannelWi
 				description,
 				broadcast,
 				encrypted,
+				federated,
 				...(teamId && { teamId }),
 			},
 		};
@@ -104,15 +111,29 @@ const CreateChannelWithData = ({ onClose, teamId = '', reload }: CreateChannelWi
 
 		onClose();
 		reload();
-	}, [broadcast, createChannel, createPrivateChannel, description, encrypted, name, onClose, readOnly, teamId, type, users, reload]);
+	}, [
+		name,
+		users,
+		readOnly,
+		description,
+		broadcast,
+		encrypted,
+		federated,
+		teamId,
+		type,
+		onClose,
+		reload,
+		createPrivateChannel,
+		createChannel,
+	]);
 
 	return (
 		<CreateChannel
 			values={values as CreateChannelProps['values']}
-			handlers={handlers}
+			handlers={handlers as ComponentProps<typeof CreateChannel>['handlers']}
 			hasUnsavedChanges={hasUnsavedChanges}
-			onChangeUsers={onChangeUsers}
 			onChangeType={onChangeType}
+			onChangeFederated={onChangeFederated}
 			onChangeBroadcast={onChangeBroadcast}
 			canOnlyCreateOneType={canOnlyCreateOneType}
 			e2eEnabledForPrivateByDefault={Boolean(e2eEnabledForPrivateByDefault)}
diff --git a/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx b/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx
index 719f38eb54db..6c26cc0586db 100644
--- a/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx
+++ b/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx
@@ -4,11 +4,11 @@ import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { FC, useState, memo } from 'react';
 
-import UserAutoCompleteMultiple from '../../components/UserAutoCompleteMultiple';
+import UserAutoCompleteMultipleFederated from '../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
 import { useEndpointActionExperimental } from '../../hooks/useEndpointActionExperimental';
 import { goToRoomById } from '../../lib/utils/goToRoomById';
 
-type Username = IUser['username'];
+type Username = Exclude<IUser['username'], undefined>;
 
 type CreateDirectMessageProps = {
 	onClose: () => void;
@@ -20,16 +20,6 @@ const CreateDirectMessage: FC<CreateDirectMessageProps> = ({ onClose }) => {
 
 	const createDirect = useEndpointActionExperimental('POST', '/v1/dm.create');
 
-	const onChangeUsers = useMutableCallback((value: Username | any, action: 'remove' | undefined) => {
-		if (!action) {
-			if (users.includes(value)) {
-				return;
-			}
-			return setUsers([...users, value]);
-		}
-		setUsers(users.filter((current) => current !== value));
-	});
-
 	const onCreate = useMutableCallback(async () => {
 		try {
 			const {
@@ -52,7 +42,7 @@ const CreateDirectMessage: FC<CreateDirectMessageProps> = ({ onClose }) => {
 			<Modal.Content>
 				<Box>{t('Direct_message_creation_description')}</Box>
 				<Box mbs='x16' display='flex' flexDirection='column' width='full'>
-					<UserAutoCompleteMultiple value={users} onChange={onChangeUsers} />
+					<UserAutoCompleteMultipleFederated value={users} onChange={setUsers} />
 				</Box>
 			</Modal.Content>
 			<Modal.Footer>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx
index ae39742aac61..839f8d7c7407 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx
@@ -3,15 +3,15 @@ import { Field, Button } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { ReactElement } from 'react';
 
-import UserAutoCompleteMultiple from '../../../../../components/UserAutoCompleteMultiple';
+import UserAutoCompleteMultipleFederated from '../../../../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
 import VerticalBar from '../../../../../components/VerticalBar';
 
 type AddUsersProps = {
 	onClickClose?: () => void;
 	onClickBack?: () => void;
 	onClickSave: () => Promise<void>;
-	users: IUser['username'][];
-	onChange: (value: IUser['username'][], action?: string) => void;
+	users: Exclude<IUser['username'], undefined>[];
+	onChange: (value: IUser['username'][]) => void;
 };
 
 const AddUsers = ({ onClickClose, onClickBack, onClickSave, users, onChange }: AddUsersProps): ReactElement => {
@@ -27,7 +27,7 @@ const AddUsers = ({ onClickClose, onClickBack, onClickSave, users, onChange }: A
 			<VerticalBar.ScrollableContent>
 				<Field>
 					<Field.Label flexGrow={0}>{t('Choose_users')}</Field.Label>
-					<UserAutoCompleteMultiple value={users} onChange={onChange} placeholder={t('Choose_users')} />
+					<UserAutoCompleteMultipleFederated value={users} onChange={onChange} placeholder={t('Choose_users')} />
 				</Field>
 			</VerticalBar.ScrollableContent>
 			<VerticalBar.Footer>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsersWithData.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsersWithData.tsx
index e088874417c5..bf9359a7e725 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsersWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsersWithData.tsx
@@ -14,7 +14,7 @@ type AddUsersWithDataProps = {
 };
 
 type AddUsersInitialProps = {
-	users: IUser['username'][];
+	users: Exclude<IUser['username'], undefined>[];
 };
 
 const AddUsersWithData = ({ rid, onClickBack, reload }: AddUsersWithDataProps): ReactElement => {
@@ -28,16 +28,6 @@ const AddUsersWithData = ({ rid, onClickBack, reload }: AddUsersWithDataProps):
 	const { users } = values as AddUsersInitialProps;
 	const { handleUsers } = handlers;
 
-	const onChangeUsers = useMutableCallback((value, action) => {
-		if (!action) {
-			if (users.includes(value)) {
-				return;
-			}
-			return handleUsers([...users, value]);
-		}
-		handleUsers(users.filter((current) => current !== value));
-	});
-
 	const handleSave = useMutableCallback(async () => {
 		try {
 			await saveAction({ rid, users });
@@ -49,7 +39,7 @@ const AddUsersWithData = ({ rid, onClickBack, reload }: AddUsersWithDataProps):
 		}
 	});
 
-	return <AddUsers onClickClose={onClickClose} onClickBack={onClickBack} onClickSave={handleSave} users={users} onChange={onChangeUsers} />;
+	return <AddUsers onClickClose={onClickClose} onClickBack={onClickBack} onClickSave={handleSave} users={users} onChange={handleUsers} />;
 };
 
 export default AddUsersWithData;
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/List/components/MemberItem.js b/apps/meteor/client/views/room/contextualBar/RoomMembers/List/components/MemberItem.js
deleted file mode 100644
index d6e1274898d2..000000000000
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/List/components/MemberItem.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Option, OptionContent, IconButton } from '@rocket.chat/fuselage';
-import { usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
-import React, { useState } from 'react';
-
-import { ReactiveUserStatus } from '../../../../../../components/UserStatus';
-import UserAvatar from '../../../../../../components/avatar/UserAvatar';
-import { usePreventProgation } from '../../../../../../hooks/usePreventProgation';
-import UserActions from './UserActions';
-
-export const MemberItem = ({ _id, status, name, username, onClickView, style, rid, reload }) => {
-	const [showButton, setShowButton] = useState();
-
-	const isReduceMotionEnabled = usePrefersReducedMotion();
-	const handleMenuEvent = {
-		[isReduceMotionEnabled ? 'onMouseEnter' : 'onTransitionEnd']: setShowButton,
-	};
-
-	const onClick = usePreventProgation();
-
-	return (
-		<Option id={_id} style={style} data-username={username} presence={status} onClick={onClickView} {...handleMenuEvent}>
-			<Option.Avatar>
-				<UserAvatar username={username} size='x28' />
-			</Option.Avatar>
-			<Option.Column>
-				<ReactiveUserStatus uid={_id} />
-			</Option.Column>
-			<OptionContent data-qa={`MemberItem-${username}`}>
-				{name} <Option.Description>({username})</Option.Description>
-			</OptionContent>
-			<Option.Menu onClick={onClick}>
-				{showButton ? <UserActions username={username} rid={rid} _id={_id} reload={reload} /> : <IconButton tiny icon='kebab' />}
-			</Option.Menu>
-		</Option>
-	);
-};
-
-MemberItem.Skeleton = Option.Skeleton;
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/List/components/MemberItem.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/List/components/MemberItem.tsx
new file mode 100644
index 000000000000..254b8c4c6f19
--- /dev/null
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/List/components/MemberItem.tsx
@@ -0,0 +1,43 @@
+import { IRoom, IUser } from '@rocket.chat/core-typings';
+import { Option, OptionAvatar, OptionColumn, OptionDescription, OptionMenu, OptionContent, Icon, IconButton } from '@rocket.chat/fuselage';
+import { usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
+import React, { ReactElement, useState, MouseEvent } from 'react';
+
+import { ReactiveUserStatus } from '../../../../../../components/UserStatus';
+import UserAvatar from '../../../../../../components/avatar/UserAvatar';
+import { usePreventPropagation } from '../../../../../../hooks/usePreventPropagation';
+import UserActions from './UserActions';
+
+type MemberItemProps = {
+	onClickView: (e: MouseEvent<HTMLDivElement>) => void;
+	rid: IRoom['_id'];
+	reload: () => void;
+} & IUser;
+
+export const MemberItem = ({ _id, name, username, federated, onClickView, rid, reload }: MemberItemProps): ReactElement => {
+	const [showButton, setShowButton] = useState();
+
+	const isReduceMotionEnabled = usePrefersReducedMotion();
+	const handleMenuEvent = {
+		[isReduceMotionEnabled ? 'onMouseEnter' : 'onTransitionEnd']: setShowButton,
+	};
+
+	const preventPropagation = usePreventPropagation();
+
+	return (
+		<Option id={_id} data-username={username} onClick={onClickView} {...handleMenuEvent}>
+			<OptionAvatar>
+				<UserAvatar username={username || ''} size='x28' />
+			</OptionAvatar>
+			<OptionColumn>{federated ? <ReactiveUserStatus uid={_id} /> : <Icon name='globe' size='x16' />}</OptionColumn>
+			<OptionContent data-qa={`MemberItem-${username}`}>
+				{name} <OptionDescription>({username})</OptionDescription>
+			</OptionContent>
+			<OptionMenu onClick={preventPropagation}>
+				{showButton ? <UserActions username={username} rid={rid} _id={_id} reload={reload} /> : <IconButton tiny icon='kebab' />}
+			</OptionMenu>
+		</Option>
+	);
+};
+
+MemberItem.Skeleton = Option.Skeleton;
diff --git a/apps/meteor/client/views/root/AppRoot.tsx b/apps/meteor/client/views/root/AppRoot.tsx
index 38f49b638233..1df7ab42660f 100644
--- a/apps/meteor/client/views/root/AppRoot.tsx
+++ b/apps/meteor/client/views/root/AppRoot.tsx
@@ -14,8 +14,8 @@ const ModalRegion = lazy(() => import('../modal/ModalRegion'));
 
 const AppRoot: FC = () => (
 	<Suspense fallback={<PageLoading />}>
-		<MeteorProvider>
-			<QueryClientProvider client={queryClient}>
+		<QueryClientProvider client={queryClient}>
+			<MeteorProvider>
 				<OmnichannelRoomIconProvider>
 					<ConnectionStatusBar />
 					<BannerRegion />
@@ -23,8 +23,8 @@ const AppRoot: FC = () => (
 					<PortalsWrapper />
 					<ModalRegion />
 				</OmnichannelRoomIconProvider>
-			</QueryClientProvider>
-		</MeteorProvider>
+			</MeteorProvider>
+		</QueryClientProvider>
 	</Suspense>
 );
 
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.js b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.js
index c60c087a309e..8b7fa1a09ef9 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.js
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.js
@@ -4,7 +4,7 @@ import { usePermission, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
 
 import RoomAvatar from '../../../../components/avatar/RoomAvatar';
-import { usePreventProgation } from '../../../../hooks/usePreventProgation';
+import { usePreventPropagation } from '../../../../hooks/usePreventProgation';
 import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
 import RoomActions from './RoomActions';
 
@@ -24,7 +24,7 @@ const TeamsChannelItem = ({ room, onClickView, reload }) => {
 		[isReduceMotionEnabled ? 'onMouseEnter' : 'onTransitionEnd']: setShowButton,
 	};
 
-	const onClick = usePreventProgation();
+	const onClick = usePreventPropagation();
 
 	return (
 		<Option id={room._id} data-rid={room._id} {...handleMenuEvent} onClick={onClickView}>
diff --git a/apps/meteor/ee/app/federation-v2/server/infrastructure/rocket-chat/slash-commands/index.ts b/apps/meteor/ee/app/federation-v2/server/infrastructure/rocket-chat/slash-commands/index.ts
index 44f9648f040f..b0817e2f7f21 100644
--- a/apps/meteor/ee/app/federation-v2/server/infrastructure/rocket-chat/slash-commands/index.ts
+++ b/apps/meteor/ee/app/federation-v2/server/infrastructure/rocket-chat/slash-commands/index.ts
@@ -32,7 +32,7 @@ const executeSlashCommand = async (
 		return;
 	}
 	const currentUserId = Meteor.userId();
-	const [command, ...externalUserIdsToInvite] = stringParams.split(' ');
+	const [command, ...externalUserIdsToInvite] = stringParams.trim().split(' ');
 	if (!currentUserId || !commands[command]) {
 		return;
 	}
diff --git a/apps/meteor/ee/client/hooks/useHasLicense.js b/apps/meteor/ee/client/hooks/useHasLicense.ts
similarity index 65%
rename from apps/meteor/ee/client/hooks/useHasLicense.js
rename to apps/meteor/ee/client/hooks/useHasLicense.ts
index 0e41499f0269..ed8a4ce77706 100644
--- a/apps/meteor/ee/client/hooks/useHasLicense.js
+++ b/apps/meteor/ee/client/hooks/useHasLicense.ts
@@ -2,8 +2,8 @@ import { useState, useEffect } from 'react';
 
 import { hasLicense } from '../../app/license/client';
 
-export const useHasLicense = (licenseName) => {
-	const [license, setLicense] = useState('loading');
+export const useHasLicense = (licenseName: string): 'loading' | boolean => {
+	const [license, setLicense] = useState<'loading' | boolean>('loading');
 
 	useEffect(() => {
 		hasLicense(licenseName).then((enabled) => {
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 20972980e5a1..684c700aa1ce 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1991,6 +1991,7 @@
   "Federation_Matrix_Enabled_Alert": "Matrix Federation Support is in alpha. Use on a production system is not recommended at this time. <a target=\"_blank\" href=\"https://go.rocket.chat/i/matrix-federation\">More Information about Matrix Federation support can be found here</>",
   "Federation_Matrix_Federated": "Federated",
   "Federation_Matrix_Federated_Description": "By creating a federated room you'll not be able to enable encryption nor broadcast",
+  "Federation_Matrix_Federated_Description_disabled": "This feature is currently disabled in this workspace.",
   "Federation_Matrix_id": "AppService ID",
   "Federation_Matrix_hs_token": "Homeserver Token",
   "Federation_Matrix_as_token": "AppService Token",
diff --git a/packages/core-typings/src/IRoom.ts b/packages/core-typings/src/IRoom.ts
index ce81b5dbfe64..126d7e107ce8 100644
--- a/packages/core-typings/src/IRoom.ts
+++ b/packages/core-typings/src/IRoom.ts
@@ -88,7 +88,7 @@ export interface IRoomFederated extends IRoom {
 	federated: true;
 }
 
-export const isIRoomFederated = (room: IRoom): room is IRoomFederated => 'federated' in room && (room as any).federated === true;
+export const isIRoomFederated = (room: Partial<IRoom>): room is IRoomFederated => 'federated' in room && (room as any).federated === true;
 export interface ICreatedRoom extends IRoom {
 	rid: string;
 }
@@ -112,7 +112,7 @@ export interface IDirectMessageRoom extends Omit<IRoom, 'default' | 'featured' |
 	usernames: Array<Username>;
 }
 
-export const isDirectMessageRoom = (room: IRoom | IDirectMessageRoom): room is IDirectMessageRoom => room.t === 'd';
+export const isDirectMessageRoom = (room: Partial<IRoom> | IDirectMessageRoom): room is IDirectMessageRoom => room.t === 'd';
 export const isMultipleDirectMessageRoom = (room: IRoom | IDirectMessageRoom): room is IDirectMessageRoom =>
 	isDirectMessageRoom(room) && room.uids.length > 2;
 
diff --git a/packages/model-typings/src/models/IUsersModel.ts b/packages/model-typings/src/models/IUsersModel.ts
index db320cc74e94..2c75adcd1066 100644
--- a/packages/model-typings/src/models/IUsersModel.ts
+++ b/packages/model-typings/src/models/IUsersModel.ts
@@ -124,5 +124,5 @@ export interface IUsersModel extends IBaseModel<IUser> {
 
 	findActiveByIdsOrUsernames(userIds: string[], options?: any): Cursor<IUser>;
 
-	setAsFederated(userId: string): Promise<void>
+	setAsFederated(userId: string): Promise<void>;
 }