diff --git a/client/views/admin/users/UsersPage.js b/client/views/admin/users/UsersPage.js
index 1478d262a53d6..549b1c1f27e12 100644
--- a/client/views/admin/users/UsersPage.js
+++ b/client/views/admin/users/UsersPage.js
@@ -3,10 +3,10 @@ import React from 'react';
 
 import Page from '../../../components/Page';
 import VerticalBar from '../../../components/VerticalBar';
-import { useRouteParameter, useRoute } from '../../../contexts/RouterContext';
+import { useRoute, useCurrentRoute } from '../../../contexts/RouterContext';
 import { useTranslation } from '../../../contexts/TranslationContext';
 import { AddUser } from './AddUser';
-import EditUserWithData from './EditUserWithData';
+import EditUserWithData from './EditUser';
 import { InviteUsers } from './InviteUsers';
 import { UserInfoWithData } from './UserInfo';
 import UsersTable from './UsersTable';
@@ -28,8 +28,7 @@ function UsersPage() {
 		usersRoute.push({ context: 'invite' });
 	};
 
-	const context = useRouteParameter('context');
-	const id = useRouteParameter('id');
+	const [, { context, id }] = useCurrentRoute();
 
 	return (
 		<Page flexDirection='row'>
diff --git a/client/views/room/MemberListRouter.js b/client/views/room/MemberListRouter.js
index 2066af793ea01..666a5fceb5cfe 100644
--- a/client/views/room/MemberListRouter.js
+++ b/client/views/room/MemberListRouter.js
@@ -6,6 +6,18 @@ import UserInfo from './contextualBar/UserInfo';
 import { useRoom } from './providers/RoomProvider';
 import { useTab, useTabBarClose, useTabContext } from './providers/ToolboxProvider';
 
+const getUid = (room, ownUserId) => {
+	if (room.uids.length === 1) {
+		return room.uids[0];
+	}
+
+	const uid = room.uids.filter((uid) => uid !== ownUserId).shift();
+
+	// Self DMs used to be created with the userId duplicated.
+	// Sometimes rooms can have 2 equal uids, but it's a self DM.
+	return uid ?? room.uids[0];
+};
+
 const MemberListRouter = ({ rid }) => {
 	const username = useTabContext();
 	const room = useRoom();
@@ -22,14 +34,7 @@ const MemberListRouter = ({ rid }) => {
 	return (
 		<UserInfo
 			width='100%'
-			{...(username
-				? { username }
-				: {
-						uid:
-							room.uids.length === 1
-								? room.uids[0]
-								: room.uids.filter((uid) => uid !== ownUserId).shift(),
-				  })}
+			{...(username ? { username } : { uid: getUid(room, ownUserId) })}
 			onClose={onClickClose}
 			rid={rid}
 		/>