diff --git a/frontend/web/components/ActionButton.tsx b/frontend/web/components/ActionButton.tsx
index 96061510272c..47e551e71ef0 100644
--- a/frontend/web/components/ActionButton.tsx
+++ b/frontend/web/components/ActionButton.tsx
@@ -1,17 +1,23 @@
 import { FC } from 'react'
 import classNames from 'classnames'
 import Icon from './Icon'
-import Button from './base/forms/Button'
+import Button, { ButtonType } from './base/forms/Button'
 
 type ActionButtonType = {
   onClick: () => void
   'data-test'?: string
+  size?: ButtonType['size']
 }
 
-const ActionButton: FC<ActionButtonType> = ({ onClick, ...rest }) => {
+const ActionButton: FC<ActionButtonType> = ({
+  onClick,
+  size = 'xSmall',
+  ...rest
+}) => {
   return (
     <Button
-      className={classNames('btn btn-with-icon btn-xs')}
+      size={size}
+      className={classNames('btn btn-with-icon')}
       data-test={rest['data-test']}
       onClick={(e) => {
         e.stopPropagation()
diff --git a/frontend/web/components/UserAction.tsx b/frontend/web/components/UserAction.tsx
index 7b355bd3d3b6..22ecee331bcd 100644
--- a/frontend/web/components/UserAction.tsx
+++ b/frontend/web/components/UserAction.tsx
@@ -97,7 +97,7 @@ export const FeatureAction: FC<FeatureActionProps> = ({
   return (
     <div>
       <div ref={btnRef}>
-        <ActionButton onClick={() => setIsOpen(true)} />
+        <ActionButton size='small' onClick={() => setIsOpen(true)} />
       </div>
 
       {isOpen && (
diff --git a/frontend/web/components/UsersGroups.tsx b/frontend/web/components/UsersGroups.tsx
new file mode 100644
index 000000000000..2dd5146dc58f
--- /dev/null
+++ b/frontend/web/components/UsersGroups.tsx
@@ -0,0 +1,150 @@
+import React, { FC } from 'react'
+import {
+  useGetGroupsQuery,
+  useUpdateGroupMutation,
+} from 'common/services/useGroup'
+import { sortBy } from 'lodash'
+import { User, UserGroup, UserGroupSummary } from 'common/types/responses'
+import Switch from './Switch'
+import PanelSearch from './PanelSearch'
+import ErrorMessage from './ErrorMessage'
+
+type UsersGroupsType = {
+  user: User
+  orgId: number
+}
+const widths = [120]
+
+const UsersGroups: FC<UsersGroupsType> = ({ orgId, user }) => {
+  const {
+    data,
+    error: groupsError,
+    isLoading,
+  } = useGetGroupsQuery({ orgId })
+  const [updateGroup, { error: saveError, isLoading: isSaving }] =
+    useUpdateGroupMutation({})
+  const error = groupsError || saveError
+  const onGroupsUpdated = (res: { error?: any }) => {
+    if (res.error) {
+      toast('Error updating group', 'danger')
+    } else {
+      toast('Updated user groups')
+    }
+  }
+  return isLoading ? (
+    <div className='text-center'>
+      <Loader />
+    </div>
+  ) : (
+    <>
+      <ErrorMessage error={error} />
+      <PanelSearch
+        noResultsText={(search: string) =>
+          search ? (
+            <Flex className='text-center'>
+              No results found for <strong>{search}</strong>
+            </Flex>
+          ) : (
+            <Flex className='text-center'>This group has no members</Flex>
+          )
+        }
+        id='org-members-list'
+        title='Groups'
+        className='no-pad overflow-visible'
+        renderSearchWithNoResults
+        items={sortBy(data?.results, 'name')}
+        filterRow={(item: UserGroupSummary, search: string) => {
+          const strToSearch = `${item.name} ${item.external_id}`
+          return strToSearch.toLowerCase().indexOf(search.toLowerCase()) !== -1
+        }}
+        header={
+          <>
+            <Row className='table-header'>
+              <Flex className='table-column px-3'>
+                <div>Group</div>
+              </Flex>
+              <div className='table-column ml-1' style={{ width: widths[0] }}>
+                Member
+              </div>
+              <div className='table-column ml-1' style={{ width: widths[1] }}>
+                Admin
+              </div>
+            </Row>
+          </>
+        }
+        renderRow={(group: UserGroup) => {
+          const { external_id, id, name, users } = group
+          const groupUser = users.find((v) => v.id === user.id)
+          const isInGroup = !!groupUser
+          const isAdmin = groupUser?.group_admin
+          return (
+            <Row className='list-item' key={id}>
+              <Flex className='table-column px-3'>
+                <div className='font-weight-medium'>{name}</div>
+                <div className='text-muted'>{external_id}</div>
+              </Flex>
+              <div className='table-column' style={{ width: widths[0] }}>
+                <Switch
+                  disabled={isSaving}
+                  checked={isInGroup}
+                  onChange={(v: boolean) => {
+                    if (v) {
+                      updateGroup({
+                        data: { ...group, users: group.users.concat([user]) },
+                        orgId: `${orgId}`,
+                        users: group.users.concat([user]),
+                        usersToAddAdmin: null,
+                        usersToRemove: null,
+                        usersToRemoveAdmin: null,
+                      }).then(onGroupsUpdated)
+                    } else {
+                      updateGroup({
+                        data: group,
+                        orgId: `${orgId}`,
+                        users: group.users,
+                        usersToAddAdmin: null,
+                        usersToRemove: [user.id],
+                        usersToRemoveAdmin: null,
+                      }).then(onGroupsUpdated)
+                    }
+                  }}
+                />
+              </div>
+              <div className='table-column' style={{ width: widths[1] }}>
+                <Switch
+                  disabled={isSaving}
+                  checked={isAdmin}
+                  onChange={(v: boolean) => {
+                    if (v) {
+                      updateGroup({
+                        data: { ...group, users: group.users.concat([user]) },
+                        orgId: `${orgId}`,
+                        users: isInGroup
+                          ? group.users
+                          : group.users.concat([user]),
+                        usersToAddAdmin: [user.id],
+                        usersToRemove: null,
+                        usersToRemoveAdmin: null,
+                      }).then(onGroupsUpdated)
+                    } else {
+                      updateGroup({
+                        data: group,
+                        orgId: `${orgId}`,
+                        users: group.users,
+                        usersToAddAdmin: null,
+                        usersToRemove: null,
+                        usersToRemoveAdmin: [user.id],
+                      }).then(onGroupsUpdated)
+                    }
+                  }}
+                />
+              </div>
+            </Row>
+          )
+        }}
+      />
+    </>
+  )
+}
+
+export default UsersGroups
diff --git a/frontend/web/components/pages/UsersAndPermissionsPage.tsx b/frontend/web/components/pages/UsersAndPermissionsPage.tsx
index ebe8da49ea02..755a7f70e8cd 100644
--- a/frontend/web/components/pages/UsersAndPermissionsPage.tsx
+++ b/frontend/web/components/pages/UsersAndPermissionsPage.tsx
@@ -36,6 +36,7 @@ import sortBy from 'lodash/sortBy'
 import UserAction from 'components/UserAction'
 import Icon from 'components/Icon'
 import RolesTable from 'components/RolesTable'
+import UsersGroups from 'components/UsersGroups'
 import PlanBasedBanner, { getPlanBasedOption } from 'components/PlanBasedAccess'
 
 type UsersAndPermissionsPageType = {
@@ -103,9 +104,24 @@ const UsersAndPermissionsInner: FC<UsersAndPermissionsInnerType> = ({
 
   const editUserPermissions = (user: User, organisationId: number) => {
     openModal(
-      'Edit Organisation Permissions',
-      <div className='p-4'>
-        <PermissionsTabs uncontrolled user={user} orgId={organisationId} />
+      `${user.first_name} ${user.last_name}`,
+      <div>
+        <Tabs uncontrolled>
+          <TabItem tabLabel='Permissions'>
+            <div className='pt-4'>
+              <PermissionsTabs
+                uncontrolled
+                user={user}
+                orgId={organisationId}
+              />
+            </div>
+          </TabItem>
+          <TabItem tabLabel='Groups'>
+            <div className='pt-4'>
+              <UsersGroups user={user} orgId={organisationId} />
+            </div>
+          </TabItem>
+        </Tabs>
       </div>,
       'p-0 side-modal',
     )
@@ -553,7 +569,7 @@ const UsersAndPermissionsInner: FC<UsersAndPermissionsInnerType> = ({
                                   style={{
                                     width: widths[2],
                                   }}
-                                  className='table-column text-end'
+                                  className='table-column d-flex justify-content-end'
                                 >
                                   <UserAction
                                     onRemove={onRemoveClick}