diff --git a/.changeset/shy-bats-worry.md b/.changeset/shy-bats-worry.md
new file mode 100644
index 0000000000000..8615105495228
--- /dev/null
+++ b/.changeset/shy-bats-worry.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Replaces old `Assign Extension` button and modal by introducing a proper input in the user edit form.
diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index b418d555761fd..048b289b3fcec 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -56,6 +56,7 @@ import { saveCustomFields } from '../../../lib/server/functions/saveCustomFields
 import { saveCustomFieldsWithoutValidation } from '../../../lib/server/functions/saveCustomFieldsWithoutValidation';
 import { saveUser } from '../../../lib/server/functions/saveUser';
 import { sendWelcomeEmail } from '../../../lib/server/functions/saveUser/sendUserEmail';
+import { canEditExtension } from '../../../lib/server/functions/saveUser/validateUserEditing';
 import { setStatusText } from '../../../lib/server/functions/setStatusText';
 import { setUserAvatar } from '../../../lib/server/functions/setUserAvatar';
 import { setUsernameWithValidation } from '../../../lib/server/functions/setUsername';
@@ -325,6 +326,10 @@ API.v1.addRoute(
 				validateCustomFields(this.bodyParams.customFields);
 			}
 
+			if (this.bodyParams.freeSwitchExtension && !(await canEditExtension(this.userId, this.bodyParams.freeSwitchExtension))) {
+				return API.v1.failure('Setting user voice call extension is not allowed', 'error-action-not-allowed');
+			}
+
 			const newUserId = await saveUser(this.userId, this.bodyParams);
 			const userId = typeof newUserId !== 'string' ? this.userId : newUserId;
 
diff --git a/apps/meteor/app/lib/server/functions/saveUser/saveNewUser.ts b/apps/meteor/app/lib/server/functions/saveUser/saveNewUser.ts
index bb9a6a1cac672..508472110fc32 100644
--- a/apps/meteor/app/lib/server/functions/saveUser/saveNewUser.ts
+++ b/apps/meteor/app/lib/server/functions/saveUser/saveNewUser.ts
@@ -47,6 +47,10 @@ export const saveNewUser = async function (userData: SaveUserData, sendPassword:
 		updater.set('emails.0.verified', userData.verified);
 	}
 
+	if (typeof userData.freeSwitchExtension === 'string' && userData.freeSwitchExtension !== '') {
+		updater.set('freeSwitchExtension', userData.freeSwitchExtension);
+	}
+
 	handleBio(updater, userData.bio);
 	handleNickname(updater, userData.nickname);
 
diff --git a/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts b/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts
index 13884b6e34b9b..e77e56cc84b9d 100644
--- a/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts
+++ b/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts
@@ -53,6 +53,8 @@ export type SaveUserData = {
 
 	customFields?: Record<string, any>;
 	active?: boolean;
+
+	freeSwitchExtension?: string;
 };
 export type UpdateUserData = RequiredField<SaveUserData, '_id'>;
 export const isUpdateUserData = (params: SaveUserData): params is UpdateUserData => '_id' in params && !!params._id;
@@ -162,6 +164,14 @@ const _saveUser = (session?: ClientSession) =>
 			}
 		}
 
+		if (typeof userData.freeSwitchExtension === 'string' && userData.freeSwitchExtension !== (oldUserData?.freeSwitchExtension ?? '')) {
+			if (userData.freeSwitchExtension.trim() === '') {
+				updater.unset('freeSwitchExtension');
+			} else {
+				updater.set('freeSwitchExtension', userData.freeSwitchExtension);
+			}
+		}
+
 		if (typeof userData.verified === 'boolean') {
 			if (oldUserData && 'emails' in oldUserData && oldUserData.emails?.some(({ address }) => address === userData.email)) {
 				const index = oldUserData.emails.findIndex(({ address }) => address === userData.email);
diff --git a/apps/meteor/app/lib/server/functions/saveUser/validateUserEditing.ts b/apps/meteor/app/lib/server/functions/saveUser/validateUserEditing.ts
index c9f3ddbe296ac..2fd4a3f0e6f42 100644
--- a/apps/meteor/app/lib/server/functions/saveUser/validateUserEditing.ts
+++ b/apps/meteor/app/lib/server/functions/saveUser/validateUserEditing.ts
@@ -1,3 +1,4 @@
+/* eslint-disable complexity */
 import { MeteorError } from '@rocket.chat/core-services';
 import type { IUser } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
@@ -11,6 +12,22 @@ const isEditingUserRoles = (previousRoles: IUser['roles'], newRoles?: IUser['rol
 	(newRoles.some((item) => !previousRoles.includes(item)) || previousRoles.some((item) => !newRoles.includes(item)));
 const isEditingField = (previousValue?: string, newValue?: string) => typeof newValue !== 'undefined' && newValue !== previousValue;
 
+export const canEditExtension = async (userId: string, newExtension?: string) => {
+	if (!settings.get('VoIP_TeamCollab_Enabled')) {
+		return false;
+	}
+
+	if (!(await hasPermissionAsync(userId, 'manage-voip-extensions'))) {
+		return false;
+	}
+
+	if (newExtension && (await Users.findOneByFreeSwitchExtension(newExtension, { projection: { _id: 1 } }))) {
+		throw new MeteorError('error-extension-not-available', 'Extension is already assigned to another user');
+	}
+
+	return true;
+};
+
 /**
  * Validate permissions to edit user fields
  *
@@ -97,4 +114,14 @@ export async function validateUserEditing(userId: IUser['_id'], userData: Update
 			action: 'Update_user',
 		});
 	}
+
+	if (
+		isEditingField(user.freeSwitchExtension ?? '', userData.freeSwitchExtension) &&
+		!(await canEditExtension(userId, userData.freeSwitchExtension))
+	) {
+		throw new MeteorError('error-action-not-allowed', 'Edit user voice call extension is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Update_user',
+		});
+	}
 }
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx b/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx
index 9e76aa0064590..cf8aa0baad335 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx
@@ -35,6 +35,11 @@ const Template: StoryFn<typeof UserInfo> = (args) => <UserInfo {...defaultArgs}
 
 export const Default = Template.bind({});
 
+export const WithVoiceCallExtension = Template.bind({});
+WithVoiceCallExtension.args = {
+	freeSwitchExtension: '1234567890',
+};
+
 export const WithABACAttributes = Template.bind({});
 WithABACAttributes.args = {
 	// @ts-expect-error - abacAttributes is not yet implemented in Users properties
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index 58bbbc1a52ee5..0cc6a86e36245 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -40,6 +40,7 @@ type UserInfoDataProps = Serialized<
 		| 'statusText'
 		| 'canViewAllInfo'
 		| 'customFields'
+		| 'freeSwitchExtension'
 	>
 >;
 
@@ -71,6 +72,7 @@ const UserInfo = ({
 	canViewAllInfo,
 	actions,
 	reason,
+	freeSwitchExtension,
 	// @ts-expect-error - abacAttributes is not yet implemented in Users properties
 	abacAttributes = null,
 	...props
@@ -180,6 +182,13 @@ const UserInfo = ({
 						</InfoPanelField>
 					)}
 
+					{freeSwitchExtension && (
+						<InfoPanelField>
+							<InfoPanelLabel>{t('Voice_call_extension')}</InfoPanelLabel>
+							<InfoPanelText>{freeSwitchExtension}</InfoPanelText>
+						</InfoPanelField>
+					)}
+
 					{abacAttributes?.length > 0 && (
 						<InfoPanelField>
 							<InfoPanelLabel title={t('ABAC_Attributes_description')}>{t('ABAC_Attributes')}</InfoPanelLabel>
diff --git a/apps/meteor/client/components/UserInfo/__snapshots__/UserInfo.spec.tsx.snap b/apps/meteor/client/components/UserInfo/__snapshots__/UserInfo.spec.tsx.snap
index 33c5d0d0d537b..3a519a834fa8f 100644
--- a/apps/meteor/client/components/UserInfo/__snapshots__/UserInfo.spec.tsx.snap
+++ b/apps/meteor/client/components/UserInfo/__snapshots__/UserInfo.spec.tsx.snap
@@ -572,3 +572,278 @@ exports[`renders WithABACAttributes without crashing 1`] = `
   </div>
 </body>
 `;
+
+exports[`renders WithVoiceCallExtension without crashing 1`] = `
+<body>
+  <div>
+    <span
+      data-focus-scope-start="true"
+      hidden=""
+    />
+    <div
+      aria-label="User Info"
+      aria-labelledby="contextualbarTitle"
+      class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-1ajmw95"
+      role="dialog"
+      tabindex="-1"
+    >
+      <div
+        class="rcx-box rcx-box--full rcx-css-1svuzur"
+      >
+        <div
+          class="rcx-box rcx-box--full rcx-css-pln26h rcx-css-1cb6i7s"
+          data-overlayscrollbars="host"
+        >
+          <div
+            class="os-size-observer"
+          >
+            <div
+              class="os-size-observer-listener"
+            />
+          </div>
+          <div
+            class=""
+            data-overlayscrollbars-viewport="scrollbarHidden overflowXHidden overflowYHidden"
+            style="margin-right: 0px; margin-bottom: 0px; margin-left: 0px; top: 0px; left: 0px; width: calc(100% + 0px); padding: 0px 0px 0px 0px;"
+            tabindex="-1"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-iag4sp"
+            >
+              <div
+                class="rcx-box rcx-box--full rcx-css-15qq8ie"
+              >
+                <div
+                  class="rcx-box rcx-box--full rcx-css-13kmycs"
+                >
+                  <figure
+                    class="rcx-box rcx-box--full rcx-avatar rcx-avatar--x332"
+                  >
+                    <img
+                      alt=""
+                      aria-hidden="true"
+                      class="rcx-avatar__element rcx-avatar__element--x332"
+                      data-username="guilherme.gazzo"
+                      src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQYV2Oora39DwAFaQJ3y3rKeAAAAABJRU5ErkJggg=="
+                      title="guilherme.gazzo"
+                    />
+                  </figure>
+                </div>
+                <div
+                  class="rcx-box rcx-box--full rcx-css-6jv9ad"
+                >
+                  <div
+                    class="rcx-box rcx-box--full rcx-css-1rn5ews"
+                  >
+                    <svg
+                      class="rcx-status-bullet rcx-status-bullet--offline undefined "
+                      fill="none"
+                      height="12"
+                      viewBox="0 0 12 12"
+                      width="12"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <circle
+                        class="rcx-status-bullet rcx-status-bullet--offline"
+                        cx="6"
+                        cy="6"
+                        r="5"
+                        stroke-width="2"
+                      />
+                    </svg>
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-dredvr"
+                      title="guilherme.gazzo"
+                    >
+                      guilherme.gazzo
+                    </div>
+                  </div>
+                  <div
+                    class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-11phrl6"
+                  >
+                    <div
+                      class="rcx-box rcx-box--full rcx-box--with-block-elements rcx-box--with-inline-elements"
+                    >
+                      <img
+                        alt="🛴"
+                        class="emojione"
+                        src="https://cdn.jsdelivr.net/emojione/assets/4.5/png/32/1f6f4.png"
+                        title=":scooter:"
+                      />
+                       currently working on User Card
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="rcx-box rcx-box--full rcx-css-6jv9ad"
+                >
+                  <div
+                    class="rcx-box rcx-box--full rcx-css-1jagyun"
+                  >
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-f0ql1y"
+                    >
+                      Nickname
+                    </div>
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-11phrl6"
+                    >
+                      gazzo
+                    </div>
+                  </div>
+                  <div
+                    class="rcx-box rcx-box--full rcx-css-1jagyun"
+                  >
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-f0ql1y"
+                    >
+                      Roles
+                    </div>
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-9vcs0o"
+                    >
+                      <span
+                        class="rcx-box rcx-box--full rcx-css-1vab7ss"
+                      >
+                        <div
+                          class="rcx-box rcx-box--full rcx-css-1i2tyln"
+                        >
+                          <span
+                            class="rcx-box rcx-box--full rcx-tag "
+                          >
+                            <span
+                              class="rcx-tag__inner"
+                            >
+                              admin
+                            </span>
+                          </span>
+                        </div>
+                        <div
+                          class="rcx-box rcx-box--full rcx-css-1i2tyln"
+                        >
+                          <span
+                            class="rcx-box rcx-box--full rcx-tag "
+                          >
+                            <span
+                              class="rcx-tag__inner"
+                            >
+                              user
+                            </span>
+                          </span>
+                        </div>
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="rcx-box rcx-box--full rcx-css-1jagyun"
+                  >
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-f0ql1y"
+                    >
+                      Username
+                    </div>
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-11phrl6"
+                      data-qa="UserInfoUserName"
+                    >
+                      guilherme.gazzo
+                    </div>
+                  </div>
+                  <div
+                    class="rcx-box rcx-box--full rcx-css-1jagyun"
+                  >
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-f0ql1y"
+                    >
+                      Bio
+                    </div>
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-11phrl6"
+                    >
+                      <div
+                        class="rcx-box rcx-box--full rcx-box--with-block-elements rcx-box--with-inline-elements"
+                      >
+                        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla tempus, eros convallis vulputate cursus, nisi neque eleifend libero, eget lacinia justo purus nec est. In at sodales ipsum. Sed lacinia quis purus eget pulvinar. Aenean eu pretium nunc, at aliquam magna. Praesent dignissim, tortor sed volutpat mattis, mauris diam pulvinar leo, porta commodo risus est non purus.
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    class="rcx-box rcx-box--full rcx-css-1jagyun"
+                  >
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-f0ql1y"
+                    >
+                      Email
+                    </div>
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-tj8yjq"
+                    >
+                      <a
+                        class="rcx-box rcx-box--full rcx-css-1te28na"
+                        href="mailto:rocketchat@rocket.chat"
+                      >
+                        rocketchat@rocket.chat
+                      </a>
+                      <span
+                        class="rcx-box rcx-box--full rcx-tag  rcx-css-1dtwr38 rcx-css-1eogw2f"
+                      >
+                        <span
+                          class="rcx-tag__inner"
+                        >
+                          Not_verified
+                        </span>
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="rcx-box rcx-box--full rcx-css-1jagyun"
+                  >
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-f0ql1y"
+                    >
+                      Voice_call_extension
+                    </div>
+                    <div
+                      class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-11phrl6"
+                    >
+                      1234567890
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="os-scrollbar os-scrollbar-horizontal os-theme-dark os-scrollbar-auto-hide os-scrollbar-auto-hide-hidden os-scrollbar-handle-interactive os-scrollbar-cornerless os-scrollbar-unusable"
+            style="--os-scroll-percent: 0; --os-viewport-percent: 0; --os-scroll-direction: 0;"
+          >
+            <div
+              class="os-scrollbar-track"
+            >
+              <div
+                class="os-scrollbar-handle"
+              />
+            </div>
+          </div>
+          <div
+            class="os-scrollbar os-scrollbar-vertical os-theme-dark os-scrollbar-auto-hide os-scrollbar-auto-hide-hidden os-scrollbar-handle-interactive os-scrollbar-cornerless os-scrollbar-unusable"
+            style="--os-scroll-percent: 0; --os-viewport-percent: 0; --os-scroll-direction: 0;"
+          >
+            <div
+              class="os-scrollbar-track"
+            >
+              <div
+                class="os-scrollbar-handle"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <span
+      data-focus-scope-end="true"
+      hidden=""
+    />
+  </div>
+</body>
+`;
diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index e84c20f54c12f..c8d706432e77f 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -37,6 +37,7 @@ import AdminUserSetRandomPasswordContent from './AdminUserSetRandomPasswordConte
 import AdminUserSetRandomPasswordRadios from './AdminUserSetRandomPasswordRadios';
 import PasswordFieldSkeleton from './PasswordFieldSkeleton';
 import { useSmtpQuery } from './hooks/useSmtpQuery';
+import { useVoipExtensionPermission } from './useVoipExtensionPermission';
 import { validateEmail } from '../../../../lib/emailValidator';
 import { parseCSV } from '../../../../lib/utils/parseCSV';
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar';
@@ -54,7 +55,10 @@ type AdminUserFormProps = {
 	roleError: Error | null;
 };
 
-export type UserFormProps = Omit<UserCreateParamsPOST & { avatar: AvatarObject; passwordConfirmation: string }, 'fields'>;
+export type UserFormProps = Omit<
+	UserCreateParamsPOST & { avatar: AvatarObject; passwordConfirmation: string; freeSwitchExtension?: string },
+	'fields'
+>;
 
 const getInitialValue = ({
 	data,
@@ -81,6 +85,7 @@ const getInitialValue = ({
 	requirePasswordChange: isNewUserPage && isSmtpEnabled && (data?.requirePasswordChange ?? true),
 	customFields: data?.customFields ?? {},
 	statusText: data?.statusText ?? '',
+	freeSwitchExtension: data?.freeSwitchExtension ?? '',
 	...(isNewUserPage && { joinDefaultChannels: true }),
 	sendWelcomeEmail: isSmtpEnabled,
 	avatar: '' as AvatarObject,
@@ -119,6 +124,8 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 		mode: 'onBlur',
 	});
 
+	const canManageVoipExtension = useVoipExtensionPermission();
+
 	const { avatar, username, setRandomPassword, password, name: userFullName } = watch();
 
 	const { mutateAsync: eventStats } = useEndpointMutation('POST', '/v1/statistics.telemetry');
@@ -177,6 +184,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 
 	const nameId = useId();
 	const usernameId = useId();
+	const voiceExtensionId = useId();
 	const emailId = useId();
 	const verifiedId = useId();
 	const statusTextId = useId();
@@ -334,6 +342,18 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 							</FieldError>
 						)}
 					</Field>
+					{canManageVoipExtension && (
+						<Field>
+							<FieldLabel htmlFor={voiceExtensionId}>{t('Voice_call_extension')}</FieldLabel>
+							<FieldRow>
+								<Controller
+									control={control}
+									name='freeSwitchExtension'
+									render={({ field }) => <TextInput {...field} id={voiceExtensionId} flexGrow={1} />}
+								/>
+							</FieldRow>
+						</Field>
+					)}
 					<Field>
 						{isLoadingSmtpStatus ? (
 							<PasswordFieldSkeleton />
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
index e3273e8dabe5a..0ae6099a1c4ba 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
@@ -67,6 +67,7 @@ const AdminUserInfoWithData = ({ uid, onReload, tab }: AdminUserInfoWithDataProp
 			nickname,
 			canViewAllInfo,
 			reason,
+			freeSwitchExtension,
 		} = data.user;
 
 		return {
@@ -90,6 +91,7 @@ const AdminUserInfoWithData = ({ uid, onReload, tab }: AdminUserInfoWithDataProp
 			statusText,
 			nickname,
 			reason,
+			freeSwitchExtension,
 		};
 	}, [approveManuallyUsers, data, getRoles]);
 
diff --git a/apps/meteor/client/views/admin/users/UsersPageHeaderContent.spec.tsx b/apps/meteor/client/views/admin/users/UsersPageHeaderContent.spec.tsx
index 8269012ac5800..2d697ec5a12ea 100644
--- a/apps/meteor/client/views/admin/users/UsersPageHeaderContent.spec.tsx
+++ b/apps/meteor/client/views/admin/users/UsersPageHeaderContent.spec.tsx
@@ -5,39 +5,6 @@ import '@testing-library/jest-dom';
 
 import UsersPageHeaderContent from './UsersPageHeaderContent';
 
-it('should not show "Assign Extension" button if voip setting is enabled but user dont have required permission', async () => {
-	render(<UsersPageHeaderContent isSeatsCapExceeded={false} seatsCap={{ activeUsers: 1, maxActiveUsers: 1 }} />, {
-		wrapper: mockAppRoot().withJohnDoe().withSetting('VoIP_TeamCollab_Enabled', true).build(),
-	});
-
-	expect(screen.queryByRole('button', { name: 'Assign_extension' })).not.toBeInTheDocument();
-});
-
-it('should not show "Assign Extension" button if user has required permission but voip setting is disabled', async () => {
-	render(<UsersPageHeaderContent isSeatsCapExceeded={false} seatsCap={{ activeUsers: 1, maxActiveUsers: 1 }} />, {
-		wrapper: mockAppRoot().withJohnDoe().withSetting('VoIP_TeamCollab_Enabled', true).build(),
-	});
-
-	expect(screen.queryByRole('button', { name: 'Assign_extension' })).not.toBeInTheDocument();
-});
-
-it('should show "Assign Extension" button if user has required permission and voip setting is enabled', async () => {
-	render(<UsersPageHeaderContent isSeatsCapExceeded={false} seatsCap={{ activeUsers: 1, maxActiveUsers: 1 }} />, {
-		wrapper: mockAppRoot().withJohnDoe().withSetting('VoIP_TeamCollab_Enabled', true).withPermission('manage-voip-extensions').build(),
-	});
-
-	expect(screen.getByRole('button', { name: 'Assign_extension' })).toBeInTheDocument();
-	expect(screen.getByRole('button', { name: 'Assign_extension' })).toBeEnabled();
-});
-
-it('should not render "Associate Extension" button when VoIP_TeamCollab_Enabled setting is disabled', async () => {
-	render(<UsersPageHeaderContent isSeatsCapExceeded={false} seatsCap={{ activeUsers: 1, maxActiveUsers: 1 }} />, {
-		wrapper: mockAppRoot().withJohnDoe().withSetting('VoIP_TeamCollab_Enabled', false).build(),
-	});
-
-	expect(screen.queryByRole('button', { name: 'Assign_extension' })).not.toBeInTheDocument();
-});
-
 it('should show "Invite" button if has build-register-user permission', () => {
 	render(<UsersPageHeaderContent isSeatsCapExceeded={false} seatsCap={{ activeUsers: 1, maxActiveUsers: 1 }} />, {
 		wrapper: mockAppRoot().withJohnDoe().withPermission('bulk-register-user').build(),
diff --git a/apps/meteor/client/views/admin/users/UsersPageHeaderContent.tsx b/apps/meteor/client/views/admin/users/UsersPageHeaderContent.tsx
index 865419bb751e3..e56befd6af333 100644
--- a/apps/meteor/client/views/admin/users/UsersPageHeaderContent.tsx
+++ b/apps/meteor/client/views/admin/users/UsersPageHeaderContent.tsx
@@ -4,10 +4,8 @@ import { useTranslation } from 'react-i18next';
 
 import SeatsCapUsage from './SeatsCapUsage';
 import type { SeatCapProps } from './useSeatsCap';
-import AssignExtensionButton from './voip/AssignExtensionButton';
 import { useExternalLink } from '../../../hooks/useExternalLink';
 import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl';
-import { useVoipExtensionPermission } from './voip/hooks/useVoipExtensionPermission';
 
 type UsersPageHeaderContentProps = {
 	isSeatsCapExceeded: boolean;
@@ -19,7 +17,6 @@ const UsersPageHeaderContent = ({ isSeatsCapExceeded, seatsCap }: UsersPageHeade
 	const router = useRouter();
 	const canCreateUser = usePermission('create-user');
 	const canBulkCreateUser = usePermission('bulk-register-user');
-	const canManageVoipExtension = useVoipExtensionPermission();
 
 	const manageSubscriptionUrl = useCheckoutUrl()({ target: 'user-page', action: 'buy_more' });
 	const openExternalLink = useExternalLink();
@@ -40,8 +37,6 @@ const UsersPageHeaderContent = ({ isSeatsCapExceeded, seatsCap }: UsersPageHeade
 				</Margins>
 			)}
 			<ButtonGroup>
-				{canManageVoipExtension && <AssignExtensionButton />}
-
 				{canBulkCreateUser && (
 					<Button icon='mail' onClick={handleInviteButtonClick} disabled={isSeatsCapExceeded}>
 						{t('Invite')}
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx
index 85407d6a5bc3a..af9a7bdd92a40 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx
@@ -1,12 +1,9 @@
-import type { IUser, Serialized } from '@rocket.chat/core-typings';
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { composeStories } from '@storybook/react';
-import { render, screen } from '@testing-library/react';
+import { render } from '@testing-library/react';
 import { axe } from 'jest-axe';
 
-import UsersTable from './UsersTable';
 import * as stories from './UsersTable.stories';
-import { createFakeUser } from '../../../../../tests/mocks/data';
 
 const testCases = Object.values(composeStories(stories)).map((Story) => [Story.storyName || 'Story', Story]);
 
@@ -22,135 +19,3 @@ test.each(testCases)('%s should have no a11y violations', async (_storyname, Sto
 	const results = await axe(container, { rules: { 'button-name': { enabled: false } } });
 	expect(results).toHaveNoViolations();
 });
-
-const createFakeAdminUser = (freeSwitchExtension?: string) =>
-	createFakeUser({
-		active: true,
-		roles: ['admin'],
-		type: 'user',
-		freeSwitchExtension,
-	});
-
-it('should not render voip extension column when voice call is disabled', async () => {
-	const user = createFakeAdminUser('1000');
-
-	render(
-		<UsersTable
-			isSuccess={true}
-			isLoading={false}
-			isError={false}
-			users={[user] as unknown as Serialized<IUser>[]}
-			total={1}
-			setUserFilters={() => undefined}
-			tab='all'
-			onReload={() => undefined}
-			paginationData={{} as any}
-			sortData={{} as any}
-			isSeatsCapExceeded={false}
-			roleData={undefined}
-		/>,
-		{
-			wrapper: mockAppRoot().withUser(user).withSetting('VoIP_TeamCollab_Enabled', false).build(),
-		},
-	);
-
-	expect(screen.queryByText('Voice_call_extension')).not.toBeInTheDocument();
-
-	screen.getByRole('button', { name: 'More_actions' }).click();
-	expect(await screen.findByRole('menu')).toBeInTheDocument();
-	expect(screen.queryByRole('menuitem', { name: /Assign_extension/ })).not.toBeInTheDocument();
-	expect(screen.queryByRole('menuitem', { name: /Unassign_extension/ })).not.toBeInTheDocument();
-});
-
-it('should not render voip extension column or actions if user doesnt have the required permission', async () => {
-	const user = createFakeAdminUser('1000');
-
-	render(
-		<UsersTable
-			isSuccess={true}
-			isLoading={false}
-			isError={false}
-			users={[user] as unknown as Serialized<IUser>[]}
-			total={1}
-			setUserFilters={() => undefined}
-			tab='all'
-			onReload={() => undefined}
-			paginationData={{} as any}
-			sortData={{} as any}
-			isSeatsCapExceeded={false}
-			roleData={undefined}
-		/>,
-		{
-			wrapper: mockAppRoot().withUser(user).withSetting('VoIP_TeamCollab_Enabled', true).build(),
-		},
-	);
-
-	expect(screen.queryByText('Voice_call_extension')).not.toBeInTheDocument();
-
-	screen.getByRole('button', { name: 'More_actions' }).click();
-	expect(await screen.findByRole('menu')).toBeInTheDocument();
-	expect(screen.queryByRole('menuitem', { name: /Assign_extension/ })).not.toBeInTheDocument();
-	expect(screen.queryByRole('menuitem', { name: /Unassign_extension/ })).not.toBeInTheDocument();
-});
-
-it('should render "Unassign_extension" button when user has a associated extension', async () => {
-	const user = createFakeAdminUser('1000');
-
-	render(
-		<UsersTable
-			isSuccess={true}
-			isLoading={false}
-			isError={false}
-			users={[user] as unknown as Serialized<IUser>[]}
-			total={1}
-			setUserFilters={() => undefined}
-			tab='all'
-			onReload={() => undefined}
-			paginationData={{} as any}
-			sortData={{} as any}
-			isSeatsCapExceeded={false}
-			roleData={undefined}
-		/>,
-		{
-			wrapper: mockAppRoot().withUser(user).withSetting('VoIP_TeamCollab_Enabled', true).withPermission('manage-voip-extensions').build(),
-		},
-	);
-
-	expect(screen.getByText('Voice_call_extension')).toBeInTheDocument();
-
-	screen.getByRole('button', { name: 'More_actions' }).click();
-	expect(await screen.findByRole('menu')).toBeInTheDocument();
-	expect(screen.queryByRole('menuitem', { name: /Assign_extension/ })).not.toBeInTheDocument();
-	expect(screen.getByRole('menuitem', { name: /Unassign_extension/ })).toBeInTheDocument();
-});
-
-it('should render "Assign_extension" button when user has no associated extension', async () => {
-	const user = createFakeAdminUser();
-
-	render(
-		<UsersTable
-			isSuccess={true}
-			isLoading={false}
-			isError={false}
-			users={[user] as unknown as Serialized<IUser>[]}
-			total={1}
-			setUserFilters={() => undefined}
-			tab='all'
-			onReload={() => undefined}
-			paginationData={{} as any}
-			sortData={{} as any}
-			isSeatsCapExceeded={false}
-			roleData={undefined}
-		/>,
-		{
-			wrapper: mockAppRoot().withUser(user).withSetting('VoIP_TeamCollab_Enabled', true).withPermission('manage-voip-extensions').build(),
-		},
-	);
-
-	expect(screen.getByText('Voice_call_extension')).toBeInTheDocument();
-
-	screen.getByRole('button', { name: 'More_actions' }).click();
-	expect(await screen.findByRole('menu')).toBeInTheDocument();
-	expect(screen.getByRole('menuitem', { name: /Assign_extension/ })).toBeInTheDocument();
-	expect(screen.queryByRole('menuitem', { name: /Unassign_extension/ })).not.toBeInTheDocument();
-});
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 303a7b7c1dbca..6d1a4751c5b95 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -21,7 +21,7 @@ import {
 import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
 import type { AdminUsersTab, UsersFilters, UsersTableSortingOption } from '../AdminUsersPage';
-import { useVoipExtensionPermission } from '../voip/hooks/useVoipExtensionPermission';
+import { useVoipExtensionPermission } from '../useVoipExtensionPermission';
 
 type UsersTableProps = {
 	tab: AdminUsersTab;
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index a8ec72c5285e5..adc79d35e1de7 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -18,7 +18,6 @@ import { useDeleteUserAction } from '../hooks/useDeleteUserAction';
 import { useResetE2EEKeyAction } from '../hooks/useResetE2EEKeyAction';
 import { useResetTOTPAction } from '../hooks/useResetTOTPAction';
 import { useSendWelcomeEmailMutation } from '../hooks/useSendWelcomeEmailMutation';
-import { useVoipExtensionAction } from '../voip/hooks/useVoipExtensionAction';
 
 type UsersTableRowProps = {
 	user: Serialized<DefaultUserInfo>;
@@ -96,19 +95,10 @@ const UsersTableRow = ({
 	const resetTOTPAction = useResetTOTPAction(userId);
 	const resetE2EKeyAction = useResetE2EEKeyAction(userId);
 	const resendWelcomeEmail = useSendWelcomeEmailMutation();
-	const voipExtensionAction = useVoipExtensionAction({
-		enabled: showVoipExtension,
-		extension: freeSwitchExtension,
-		username,
-		name,
-	});
 
 	const isNotPendingDeactivatedNorFederated = tab !== 'pending' && tab !== 'deactivated' && !isFederatedUser;
 	const actions = useMemo(
 		() => ({
-			...(voipExtensionAction && {
-				voipExtensionAction,
-			}),
 			...(isNotPendingDeactivatedNorFederated &&
 				changeAdminStatusAction && {
 					changeAdminStatusAction,
@@ -134,7 +124,6 @@ const UsersTableRow = ({
 			isNotPendingDeactivatedNorFederated,
 			resetE2EKeyAction,
 			resetTOTPAction,
-			voipExtensionAction,
 		],
 	);
 
diff --git a/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionPermission.tsx b/apps/meteor/client/views/admin/users/useVoipExtensionPermission.tsx
similarity index 100%
rename from apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionPermission.tsx
rename to apps/meteor/client/views/admin/users/useVoipExtensionPermission.tsx
diff --git a/apps/meteor/client/views/admin/users/voip/AssignExtensionButton.tsx b/apps/meteor/client/views/admin/users/voip/AssignExtensionButton.tsx
deleted file mode 100644
index 4155f3721a243..0000000000000
--- a/apps/meteor/client/views/admin/users/voip/AssignExtensionButton.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Button } from '@rocket.chat/fuselage';
-import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { useSetModal } from '@rocket.chat/ui-contexts';
-import type { ComponentProps } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import AssignExtensionModal from './AssignExtensionModal';
-
-const AssignExtensionButton = (props: ComponentProps<typeof Button>) => {
-	const { t } = useTranslation();
-	const setModal = useSetModal();
-
-	const handleAssign = useEffectEvent(() => {
-		setModal(<AssignExtensionModal onClose={(): void => setModal(null)} />);
-	});
-
-	return (
-		<Button {...props} icon='phone' onClick={handleAssign}>
-			{t('Assign_extension')}
-		</Button>
-	);
-};
-
-export default AssignExtensionButton;
diff --git a/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.spec.tsx b/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.spec.tsx
deleted file mode 100644
index b60cc09222f85..0000000000000
--- a/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.spec.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-/* eslint-disable testing-library/no-await-sync-events */
-import { faker } from '@faker-js/faker';
-import { UserStatus } from '@rocket.chat/core-typings';
-import { mockAppRoot } from '@rocket.chat/mock-providers';
-import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-import AssignExtensionModal from './AssignExtensionModal';
-
-const appRoot = mockAppRoot()
-	.withJohnDoe()
-	.withEndpoint('POST', '/v1/voip-freeswitch.extension.assign', () => null)
-	.withEndpoint('GET', '/v1/voip-freeswitch.extension.list', () => ({
-		extensions: [
-			{
-				extension: '1000',
-				context: 'default',
-				domain: '172.31.38.45',
-				groups: ['default', 'sales'],
-				status: 'UNREGISTERED' as const,
-				contact: 'error/user_not_registered',
-				callGroup: 'techsupport',
-				callerName: 'Extension 1000',
-				callerNumber: '1000',
-			},
-		],
-		success: true,
-	}))
-	.withEndpoint('GET', '/v1/users.autocomplete', () => ({
-		items: [
-			{
-				_id: faker.database.mongodbObjectId(),
-				name: 'Jane Doe',
-				username: 'jane.doe',
-				nickname: '',
-				status: UserStatus.OFFLINE,
-				avatarETag: '',
-			},
-		],
-		success: true,
-	}));
-
-it.todo('should load with default user');
-
-it.todo('should load with default extension');
-
-it('should only enable "Available extensions" field if username is informed', async () => {
-	render(<AssignExtensionModal onClose={() => undefined} />, {
-		wrapper: appRoot.build(),
-	});
-
-	const extensionsSelect = screen.getByRole('button', { name: /Select_an_option/i });
-	expect(extensionsSelect).toHaveClass('disabled');
-	expect(screen.getByLabelText('User')).toBeEnabled();
-
-	screen.getByLabelText('User').focus();
-	const userOption = await screen.findByRole('option', { name: 'Jane Doe' });
-	await userEvent.click(userOption);
-
-	await waitFor(() => expect(extensionsSelect).not.toHaveClass('disabled'));
-});
-
-it('should only enable "Associate" button both username and extension is informed', async () => {
-	render(<AssignExtensionModal onClose={() => undefined} />, {
-		wrapper: appRoot.build(),
-	});
-
-	expect(screen.getByRole('button', { name: /Associate/i, hidden: true })).toBeDisabled();
-
-	screen.getByLabelText('User').focus();
-	const userOption = await screen.findByRole('option', { name: 'Jane Doe' });
-	await userEvent.click(userOption);
-
-	const extensionsSelect = screen.getByRole('button', { name: /Select_an_option/i });
-	await waitFor(() => expect(extensionsSelect).not.toHaveClass('disabled'));
-
-	extensionsSelect.click();
-	const extOption = await screen.findByRole('option', { name: '1000' });
-	await userEvent.click(extOption);
-
-	expect(screen.getByRole('button', { name: /Associate/i, hidden: true })).toBeEnabled();
-});
-
-it('should call onClose when extension is associated', async () => {
-	const closeFn = jest.fn();
-	render(<AssignExtensionModal onClose={closeFn} />, {
-		wrapper: appRoot.build(),
-	});
-
-	screen.getByLabelText('User').focus();
-	const userOption = await screen.findByRole('option', { name: 'Jane Doe' });
-	await userEvent.click(userOption);
-
-	const extensionsSelect = screen.getByRole('button', { name: /Select_an_option/i });
-	await waitFor(() => expect(extensionsSelect).not.toHaveClass('disabled'));
-
-	extensionsSelect.click();
-	const extOption = await screen.findByRole('option', { name: '1000' });
-	await userEvent.click(extOption);
-
-	screen.getByRole('button', { name: /Associate/i, hidden: true }).click();
-	await waitFor(() => expect(closeFn).toHaveBeenCalled());
-});
-
-it('should call onClose when cancel button is clicked', () => {
-	const closeFn = jest.fn();
-	render(<AssignExtensionModal onClose={closeFn} />, {
-		wrapper: appRoot.build(),
-	});
-
-	screen.getByRole('button', { name: /Cancel/i, hidden: true }).click();
-	expect(closeFn).toHaveBeenCalled();
-});
-
-it('should call onClose when cancel button is clicked', () => {
-	const closeFn = jest.fn();
-	render(<AssignExtensionModal onClose={closeFn} />, {
-		wrapper: appRoot.build(),
-	});
-
-	screen.getByRole('button', { name: /Close/i, hidden: true }).click();
-	expect(closeFn).toHaveBeenCalled();
-});
diff --git a/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.tsx b/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.tsx
deleted file mode 100644
index 3d43e8a4c1f9f..0000000000000
--- a/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.tsx
+++ /dev/null
@@ -1,164 +0,0 @@
-import {
-	Button,
-	Modal,
-	Select,
-	Field,
-	FieldGroup,
-	FieldLabel,
-	FieldRow,
-	Box,
-	ModalHeader,
-	ModalTitle,
-	ModalClose,
-	ModalContent,
-	ModalFooter,
-	ModalFooterControllers,
-} from '@rocket.chat/fuselage';
-import { UserAutoComplete } from '@rocket.chat/ui-client';
-import { useToastMessageDispatch, useEndpoint, useUser } from '@rocket.chat/ui-contexts';
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useId, useMemo } from 'react';
-import { Controller, useForm, useWatch } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-
-type AssignExtensionModalProps = {
-	onClose: () => void;
-	defaultExtension?: string;
-	defaultUsername?: string;
-};
-
-type FormValue = {
-	username: string;
-	extension: string;
-};
-
-const AssignExtensionModal = ({ defaultExtension, defaultUsername, onClose }: AssignExtensionModalProps) => {
-	const { t } = useTranslation();
-	const dispatchToastMessage = useToastMessageDispatch();
-	const queryClient = useQueryClient();
-
-	const loggedUser = useUser();
-
-	const assignUser = useEndpoint('POST', '/v1/voip-freeswitch.extension.assign');
-	const getAvailableExtensions = useEndpoint('GET', '/v1/voip-freeswitch.extension.list');
-
-	const modalTitleId = useId();
-	const usersWithoutExtensionsId = useId();
-	const freeExtensionNumberId = useId();
-
-	const {
-		control,
-		handleSubmit,
-		formState: { isSubmitting },
-	} = useForm<FormValue>({
-		defaultValues: {
-			username: defaultUsername,
-			extension: defaultExtension,
-		},
-	});
-
-	const selectedUsername = useWatch({ control, name: 'username' });
-	const selectedExtension = useWatch({ control, name: 'extension' });
-
-	const { data: availableExtensions = [], isLoading } = useQuery({
-		queryKey: ['/v1/voip-freeswitch.extension.list', selectedUsername],
-		queryFn: () => getAvailableExtensions({ type: 'available' as const, username: selectedUsername }),
-		select: (data) => data.extensions || [],
-		enabled: !!selectedUsername,
-	});
-
-	const extensionOptions = useMemo<[string, string][]>(
-		() => availableExtensions.map(({ extension }) => [extension, extension]),
-		[availableExtensions],
-	);
-
-	const handleAssignment = useMutation({
-		mutationFn: async ({ username, extension }: FormValue) => {
-			await assignUser({ username, extension });
-
-			queryClient.invalidateQueries({
-				queryKey: ['users.list'],
-			});
-			if (loggedUser?.username === username) {
-				queryClient.invalidateQueries({
-					queryKey: ['voip-client'],
-				});
-			}
-
-			onClose();
-		},
-		onError: (error) => {
-			dispatchToastMessage({ type: 'error', message: error });
-			onClose();
-		},
-	});
-
-	return (
-		<Modal
-			aria-labelledby={modalTitleId}
-			wrapperFunction={(props) => <Box is='form' onSubmit={handleSubmit((data) => handleAssignment.mutateAsync(data))} {...props} />}
-		>
-			<ModalHeader>
-				<ModalTitle id={modalTitleId}>{t('Assign_extension')}</ModalTitle>
-				<ModalClose aria-label={t('Close')} onClick={onClose} />
-			</ModalHeader>
-			<ModalContent>
-				<FieldGroup>
-					<Field>
-						<FieldLabel htmlFor={usersWithoutExtensionsId}>{t('User')}</FieldLabel>
-						<FieldRow>
-							<Controller
-								control={control}
-								name='username'
-								render={({ field }) => (
-									<UserAutoComplete
-										id={usersWithoutExtensionsId}
-										value={field.value}
-										onChange={field.onChange}
-										conditions={{
-											$or: [
-												{ freeSwitchExtension: { $exists: true, $eq: selectedExtension } },
-												{ freeSwitchExtension: { $exists: false } },
-												{ username: { $exists: true, $eq: selectedUsername } },
-											],
-										}}
-									/>
-								)}
-							/>
-						</FieldRow>
-					</Field>
-
-					<Field>
-						<FieldLabel htmlFor={freeExtensionNumberId}>{t('Available_extensions')}</FieldLabel>
-						<FieldRow>
-							<Controller
-								control={control}
-								name='extension'
-								render={({ field }) => (
-									<Select
-										id={freeExtensionNumberId}
-										disabled={isLoading || !selectedUsername}
-										options={extensionOptions}
-										placeholder={t('Select_an_option')}
-										value={field.value}
-										onChange={field.onChange}
-									/>
-								)}
-							/>
-						</FieldRow>
-					</Field>
-				</FieldGroup>
-			</ModalContent>
-			<ModalFooter>
-				<ModalFooterControllers>
-					<Button onClick={onClose}>{t('Cancel')}</Button>
-					<Button primary disabled={!selectedUsername || !selectedExtension} loading={isSubmitting} type='submit'>
-						{t('Associate')}
-					</Button>
-				</ModalFooterControllers>
-			</ModalFooter>
-		</Modal>
-	);
-};
-
-export default AssignExtensionModal;
diff --git a/apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.spec.tsx b/apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.spec.tsx
deleted file mode 100644
index ebd07e105a90b..0000000000000
--- a/apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.spec.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { mockAppRoot } from '@rocket.chat/mock-providers';
-import { render, screen, waitFor } from '@testing-library/react';
-
-import '@testing-library/jest-dom';
-import RemoveExtensionModal from './RemoveExtensionModal';
-
-const appRoot = mockAppRoot().withJohnDoe();
-
-it('should have user and extension informed', async () => {
-	render(<RemoveExtensionModal name='John Doe' username='john.doe' extension='1000' onClose={() => undefined} />, {
-		wrapper: appRoot.build(),
-	});
-
-	expect(screen.getByLabelText('User')).toHaveValue('John Doe');
-	expect(screen.getByLabelText('Extension')).toHaveValue('1000');
-});
-
-it('should call assign endpoint and onClose when extension is removed', async () => {
-	const closeFn = jest.fn();
-	const assignFn = jest.fn(() => null);
-	render(<RemoveExtensionModal name='John Doe' username='john.doe' extension='1000' onClose={closeFn} />, {
-		wrapper: appRoot.withEndpoint('POST', '/v1/voip-freeswitch.extension.assign', assignFn).build(),
-	});
-
-	screen.getByRole('button', { name: /Remove/i, hidden: true }).click();
-
-	await waitFor(() => expect(assignFn).toHaveBeenCalled());
-	await waitFor(() => expect(closeFn).toHaveBeenCalled());
-});
-
-it('should call onClose when cancel button is clicked', () => {
-	const closeFn = jest.fn();
-	render(<RemoveExtensionModal name='John Doe' username='john.doe' extension='1000' onClose={closeFn} />, {
-		wrapper: appRoot.build(),
-	});
-
-	screen.getByRole('button', { name: /Cancel/i, hidden: true }).click();
-	expect(closeFn).toHaveBeenCalled();
-});
-
-it('should call onClose when cancel button is clicked', () => {
-	const closeFn = jest.fn();
-	render(<RemoveExtensionModal name='John Doe' username='john.doe' extension='1000' onClose={closeFn} />, {
-		wrapper: appRoot.build(),
-	});
-
-	screen.getByRole('button', { name: /Close/i, hidden: true }).click();
-	expect(closeFn).toHaveBeenCalled();
-});
diff --git a/apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.tsx b/apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.tsx
deleted file mode 100644
index 52fd37db6d1ea..0000000000000
--- a/apps/meteor/client/views/admin/users/voip/RemoveExtensionModal.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import {
-	Button,
-	Modal,
-	Field,
-	FieldGroup,
-	FieldLabel,
-	FieldRow,
-	TextInput,
-	ModalHeader,
-	ModalTitle,
-	ModalClose,
-	ModalContent,
-	ModalFooter,
-	ModalFooterControllers,
-} from '@rocket.chat/fuselage';
-import { useToastMessageDispatch, useEndpoint, useUser } from '@rocket.chat/ui-contexts';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { useId } from 'react';
-import { useTranslation } from 'react-i18next';
-
-type RemoveExtensionModalProps = {
-	name: string;
-	extension: string;
-	username: string;
-	onClose: () => void;
-};
-
-const RemoveExtensionModal = ({ name, extension, username, onClose }: RemoveExtensionModalProps) => {
-	const { t } = useTranslation();
-	const dispatchToastMessage = useToastMessageDispatch();
-	const queryClient = useQueryClient();
-
-	const loggedUser = useUser();
-
-	const removeExtension = useEndpoint('POST', '/v1/voip-freeswitch.extension.assign');
-
-	const modalTitleId = useId();
-	const userFieldId = useId();
-	const freeExtensionNumberId = useId();
-
-	const handleRemoveExtension = useMutation({
-		mutationFn: (username: string) => removeExtension({ username }),
-		onSuccess: () => {
-			dispatchToastMessage({ type: 'success', message: t('Extension_removed') });
-
-			queryClient.invalidateQueries({
-				queryKey: ['users.list'],
-			});
-			if (loggedUser?.username === username) {
-				queryClient.invalidateQueries({
-					queryKey: ['voip-client'],
-				});
-			}
-
-			onClose();
-		},
-		onError: (error) => {
-			dispatchToastMessage({ type: 'error', message: error });
-			onClose();
-		},
-	});
-
-	return (
-		<Modal aria-labelledby={modalTitleId}>
-			<ModalHeader>
-				<ModalTitle id={modalTitleId}>{t('Remove_extension')}</ModalTitle>
-				<ModalClose aria-label={t('Close')} onClick={onClose} />
-			</ModalHeader>
-			<ModalContent>
-				<FieldGroup>
-					<Field>
-						<FieldLabel htmlFor={userFieldId}>{t('User')}</FieldLabel>
-						<FieldRow>
-							<TextInput disabled id={userFieldId} value={name} />
-						</FieldRow>
-					</Field>
-
-					<Field>
-						<FieldLabel htmlFor={freeExtensionNumberId}>{t('Extension')}</FieldLabel>
-						<FieldRow>
-							<TextInput disabled id={freeExtensionNumberId} value={extension} />
-						</FieldRow>
-					</Field>
-				</FieldGroup>
-			</ModalContent>
-			<ModalFooter>
-				<ModalFooterControllers>
-					<Button onClick={onClose}>{t('Cancel')}</Button>
-					<Button danger onClick={() => handleRemoveExtension.mutate(username)} loading={handleRemoveExtension.isPending}>
-						{t('Remove')}
-					</Button>
-				</ModalFooterControllers>
-			</ModalFooter>
-		</Modal>
-	);
-};
-
-export default RemoveExtensionModal;
diff --git a/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionAction.tsx b/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionAction.tsx
deleted file mode 100644
index 3f7f7fe84d09c..0000000000000
--- a/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionAction.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { useSetModal } from '@rocket.chat/ui-contexts';
-import { useTranslation } from 'react-i18next';
-
-import type { AdminUserAction } from '../../hooks/useAdminUserInfoActions';
-import AssignExtensionModal from '../AssignExtensionModal';
-import RemoveExtensionModal from '../RemoveExtensionModal';
-
-type VoipExtensionActionParams = {
-	name: string;
-	username: string;
-	extension?: string;
-	enabled: boolean;
-};
-
-export const useVoipExtensionAction = ({ name, username, extension, enabled }: VoipExtensionActionParams): AdminUserAction | undefined => {
-	const { t } = useTranslation();
-	const setModal = useSetModal();
-
-	const handleExtensionAssignment = useEffectEvent(() => {
-		if (extension) {
-			setModal(<RemoveExtensionModal name={name} username={username} extension={extension} onClose={(): void => setModal(null)} />);
-			return;
-		}
-
-		setModal(<AssignExtensionModal defaultUsername={username} onClose={(): void => setModal(null)} />);
-	});
-
-	return enabled
-		? {
-				icon: extension ? 'phone-disabled' : 'phone',
-				content: extension ? t('Unassign_extension') : t('Assign_extension'),
-				onClick: handleExtensionAssignment,
-			}
-		: undefined;
-};
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
index 5d7dbab582d2e..22170ac1a1451 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
@@ -65,6 +65,7 @@ const UserInfoWithData = ({ uid, username, rid, onClose, onClickBack }: UserInfo
 			nickname,
 			createdAt,
 			canViewAllInfo,
+			freeSwitchExtension,
 		} = data.user;
 
 		return {
@@ -87,6 +88,7 @@ const UserInfoWithData = ({ uid, username, rid, onClose, onClickBack }: UserInfo
 			status: <ReactiveUserStatus uid={_id} />,
 			statusText,
 			nickname,
+			freeSwitchExtension,
 		};
 	}, [data, getRoles]);
 
diff --git a/apps/meteor/ee/app/api-enterprise/server/voip-freeswitch.ts b/apps/meteor/ee/app/api-enterprise/server/voip-freeswitch.ts
index fd4f96471200a..dd7999286de30 100644
--- a/apps/meteor/ee/app/api-enterprise/server/voip-freeswitch.ts
+++ b/apps/meteor/ee/app/api-enterprise/server/voip-freeswitch.ts
@@ -68,6 +68,10 @@ API.v1.addRoute(
 		authRequired: true,
 		permissionsRequired: ['manage-voip-extensions'],
 		validateParams: isVoipFreeSwitchExtensionAssignProps,
+		deprecation: {
+			version: '8.0.0',
+			alternatives: ['/v1/users.update'],
+		},
 		license: ['voip-enterprise'],
 	},
 	{
diff --git a/apps/meteor/tests/data/users.helper.ts b/apps/meteor/tests/data/users.helper.ts
index 51d61cab20fc5..287943d2a687a 100644
--- a/apps/meteor/tests/data/users.helper.ts
+++ b/apps/meteor/tests/data/users.helper.ts
@@ -18,6 +18,7 @@ export const createUser = <TUser extends IUser>(
 		requirePasswordChange?: boolean;
 		name?: string;
 		password?: string;
+		freeSwitchExtension?: string;
 	} = {},
 ) =>
 	new Promise<TestUser<TUser>>((resolve, reject) => {
diff --git a/apps/meteor/tests/end-to-end/api/users.ts b/apps/meteor/tests/end-to-end/api/users.ts
index fa2057137a418..aee958ce4f2cf 100644
--- a/apps/meteor/tests/end-to-end/api/users.ts
+++ b/apps/meteor/tests/end-to-end/api/users.ts
@@ -576,6 +576,123 @@ describe('[Users]', () => {
 					});
 			});
 		});
+
+		(IS_EE ? describe : describe.skip)('Voice call extension', () => {
+			beforeEach(async () => {
+				await updateSetting('VoIP_TeamCollab_Enabled', true);
+				await updatePermission('manage-voip-extensions', ['admin']);
+			});
+
+			after(async () => {
+				await updateSetting('VoIP_TeamCollab_Enabled', true);
+				await updatePermission('manage-voip-extensions', ['admin']);
+			});
+
+			it('should create a user with a voice call extension', async () => {
+				const freeSwitchExtension = '888999';
+				let user: TestUser<IUser>;
+				await request
+					.post(api('users.create'))
+					.set(credentials)
+					.send({
+						email: 'success_extension_user@rocket.chat',
+						name: 'success_extension_user',
+						username: 'success_extension_user',
+						password,
+						active: true,
+						roles: ['user'],
+						joinDefaultChannels: true,
+						verified: true,
+						freeSwitchExtension,
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.nested.property('user.freeSwitchExtension', freeSwitchExtension);
+						user = res.body.user;
+					});
+
+				if (user!) {
+					await deleteUser(user);
+				}
+			});
+
+			it('should not create a user with a voice call extension that is already in use', async () => {
+				const freeSwitchExtension = '123123';
+				const user = await createUser({ freeSwitchExtension });
+				await request
+					.post(api('users.create'))
+					.set(credentials)
+					.send({
+						email: 'fail_extension_in_use@rocket.chat',
+						name: 'fail_extension_in_use',
+						username: 'fail_extension_in_use',
+						password,
+						active: true,
+						roles: ['user'],
+						joinDefaultChannels: true,
+						verified: true,
+						freeSwitchExtension,
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('errorType', 'error-extension-not-available');
+					});
+
+				await deleteUser(user);
+			});
+
+			it('should not create a user if voip is disabled', async () => {
+				await updateSetting('VoIP_TeamCollab_Enabled', false);
+				await request
+					.post(api('users.create'))
+					.set(credentials)
+					.send({
+						email: 'fail_voip_disabled@rocket.chat',
+						name: 'fail_voip_disabled',
+						username: 'fail_voip_disabled',
+						password,
+						active: true,
+						roles: ['user'],
+						joinDefaultChannels: true,
+						verified: true,
+						freeSwitchExtension: '999',
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('errorType', 'error-action-not-allowed');
+					});
+			});
+
+			it('should not create a user if user has no permission to manage voip extensions', async () => {
+				await updatePermission('manage-voip-extensions', []);
+				await request
+					.post(api('users.create'))
+					.set(credentials)
+					.send({
+						email: 'fail_no_permission@rocket.chat',
+						name: 'fail_no_permission',
+						username: 'fail_no_permission',
+						password,
+						active: true,
+						roles: ['user'],
+						joinDefaultChannels: true,
+						verified: true,
+						freeSwitchExtension: '999',
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('errorType', 'error-action-not-allowed');
+					});
+			});
+		});
 	});
 
 	describe('[/users.register]', () => {
@@ -2296,6 +2413,92 @@ describe('[Users]', () => {
 				expect(updateResponse.body).to.have.nested.property('user.customFields.customFieldText1', null);
 			});
 		});
+
+		(IS_EE ? describe : describe.skip)('Voice call extension', () => {
+			let user: TestUser<IUser>;
+
+			before(async () => {
+				user = await createUser();
+			});
+
+			after(async () => {
+				await Promise.all([
+					deleteUser(user),
+					updateSetting('VoIP_TeamCollab_Enabled', true),
+					updatePermission('manage-voip-extensions', ['admin']),
+				]);
+			});
+
+			beforeEach(async () => {
+				await Promise.all([updatePermission('manage-voip-extensions', ['admin']), updateSetting('VoIP_TeamCollab_Enabled', true)]);
+			});
+
+			it("should update the user's voice call extension", async () => {
+				await request
+					.post(api('users.update'))
+					.set(credentials)
+					.send({
+						userId: user._id,
+						data: {
+							freeSwitchExtension: '999',
+						},
+					})
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.nested.property('user.freeSwitchExtension', '999');
+					});
+			});
+
+			it("should not update the user's voice call extension if the extension is already assigned to another user", async () => {
+				await request
+					.post(api('users.update'))
+					.set(credentials)
+					.send({
+						userId: targetUser._id,
+						data: {
+							freeSwitchExtension: '999',
+						},
+					})
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('error', 'Extension is already assigned to another user [error-extension-not-available]');
+					});
+			});
+
+			it("should not update the user's voice call extension if the user has no permission to manage voip extensions", async () => {
+				await updatePermission('manage-voip-extensions', []);
+				await request
+					.post(api('users.update'))
+					.set(credentials)
+					.send({
+						userId: user._id,
+						data: {
+							freeSwitchExtension: '9998',
+						},
+					})
+					.expect(400);
+			});
+
+			it("should not update the user's voice call extension if voip setting is disabled", async () => {
+				await updateSetting('VoIP_TeamCollab_Enabled', false);
+				await request
+					.post(api('users.update'))
+					.set(credentials)
+					.send({
+						userId: user._id,
+						data: {
+							freeSwitchExtension: '9998',
+						},
+					})
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('error', 'Edit user voice call extension is not allowed [error-action-not-allowed]');
+					});
+			});
+		});
 	});
 
 	describe('[/users.updateOwnBasicInfo]', () => {
diff --git a/packages/rest-typings/src/v1/users/UserCreateParamsPOST.ts b/packages/rest-typings/src/v1/users/UserCreateParamsPOST.ts
index 1590329c9df94..66295f6349c7c 100644
--- a/packages/rest-typings/src/v1/users/UserCreateParamsPOST.ts
+++ b/packages/rest-typings/src/v1/users/UserCreateParamsPOST.ts
@@ -22,6 +22,7 @@ export type UserCreateParamsPOST = {
 	verified?: boolean;
 	customFields?: Record<string, any>;
 	settings?: IUserSettings;
+	freeSwitchExtension?: string;
 	/* @deprecated */
 	fields: string;
 };
@@ -45,6 +46,7 @@ const userCreateParamsPostSchema = {
 		verified: { type: 'boolean', nullable: true },
 		customFields: { type: 'object' },
 		fields: { type: 'string', nullable: true },
+		freeSwitchExtension: { type: 'string', nullable: true },
 	},
 	additionalProperties: false,
 	required: ['email', 'name', 'password', 'username'],
diff --git a/packages/rest-typings/src/v1/users/UsersUpdateParamsPOST.ts b/packages/rest-typings/src/v1/users/UsersUpdateParamsPOST.ts
index bcad10d9e2992..d45477765c34f 100644
--- a/packages/rest-typings/src/v1/users/UsersUpdateParamsPOST.ts
+++ b/packages/rest-typings/src/v1/users/UsersUpdateParamsPOST.ts
@@ -25,6 +25,7 @@ export type UsersUpdateParamsPOST = {
 		settings?: IUserSettings;
 		language?: string;
 		status?: string;
+		freeSwitchExtension?: string;
 	};
 	confirmRelinquish?: boolean;
 };
@@ -105,6 +106,10 @@ const UsersUpdateParamsPostSchema = {
 					type: 'string',
 					nullable: true,
 				},
+				freeSwitchExtension: {
+					type: 'string',
+					nullable: true,
+				},
 			},
 			required: [],
 			additionalProperties: false,