diff --git a/messages/en-US.json b/messages/en-US.json
index d6a156d7..6b31db25 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -394,9 +394,8 @@
     "userErrorOrgRemoveDescription": "An error occurred while removing the user.",
     "userOrgRemoved": "User removed",
     "userOrgRemovedDescription": "The user {email} has been removed from the organization.",
-    "userQuestionOrgRemove": "Are you sure you want to remove {email} from the organization?",
+    "userQuestionOrgRemove": "Are you sure you want to remove this user from the organization?",
     "userMessageOrgRemove": "Once removed, this user will no longer have access to the organization. You can always re-invite them later, but they will need to accept the invitation again.",
-    "userMessageOrgConfirm": "To confirm, please type the name of the of the user below.",
     "userRemoveOrgConfirm": "Confirm Remove User",
     "userRemoveOrg": "Remove User from Organization",
     "users": "Users",
diff --git a/src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx b/src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx
index 8f89efa1..6e9ab237 100644
--- a/src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx
+++ b/src/app/[orgId]/settings/(private)/remote-exit-nodes/ExitNodesTable.tsx
@@ -270,7 +270,7 @@ export default function ExitNodesTable({
                         setSelectedNode(null);
                     }}
                     dialog={
-                        <div className="space-y-4">
+                        <div>
                             <p>
                                 {t("remoteExitNodeQuestionRemove")}
                             </p>
diff --git a/src/app/[orgId]/settings/general/page.tsx b/src/app/[orgId]/settings/general/page.tsx
index 7074c02d..b301fd32 100644
--- a/src/app/[orgId]/settings/general/page.tsx
+++ b/src/app/[orgId]/settings/general/page.tsx
@@ -167,7 +167,7 @@ export default function GeneralPage() {
                     setIsDeleteModalOpen(val);
                 }}
                 dialog={
-                    <div className="space-y-4">
+                    <div>
                         <p>
                             {t("orgQuestionRemove")}
                         </p>
diff --git a/src/app/admin/license/page.tsx b/src/app/admin/license/page.tsx
index 27055518..d01b215a 100644
--- a/src/app/admin/license/page.tsx
+++ b/src/app/admin/license/page.tsx
@@ -315,7 +315,7 @@ export default function LicensePage() {
                         setSelectedLicenseKey(null);
                     }}
                     dialog={
-                        <div className="space-y-4">
+                        <div>
                             <p>
                                 {t("licenseQuestionRemove")}
                             </p>
diff --git a/src/app/admin/users/AdminUsersTable.tsx b/src/app/admin/users/AdminUsersTable.tsx
index 991a2c29..c71c0ba9 100644
--- a/src/app/admin/users/AdminUsersTable.tsx
+++ b/src/app/admin/users/AdminUsersTable.tsx
@@ -237,7 +237,7 @@ export default function UsersTable({ users }: Props) {
                         setSelected(null);
                     }}
                     dialog={
-                        <div className="space-y-4">
+                        <div>
                             <p>
                                 {t("userQuestionRemove")}
                             </p>
diff --git a/src/components/AdminIdpTable.tsx b/src/components/AdminIdpTable.tsx
index 2db1415e..cea32da3 100644
--- a/src/components/AdminIdpTable.tsx
+++ b/src/components/AdminIdpTable.tsx
@@ -193,7 +193,7 @@ export default function IdpTable({ idps }: Props) {
                         setSelectedIdp(null);
                     }}
                     dialog={
-                        <div className="space-y-4">
+                        <div>
                             <p>
                                 {t("idpQuestionRemove", {
                                     name: selectedIdp.name
diff --git a/src/components/AdminUsersTable.tsx b/src/components/AdminUsersTable.tsx
index 6bca4a74..5030377a 100644
--- a/src/components/AdminUsersTable.tsx
+++ b/src/components/AdminUsersTable.tsx
@@ -256,7 +256,7 @@ export default function UsersTable({ users }: Props) {
                         setSelected(null);
                     }}
                     dialog={
-                        <div className="space-y-4">
+                        <div>
                             <p>
                                 {t("userQuestionRemove", {
                                     selectedUser:
diff --git a/src/components/ApiKeysTable.tsx b/src/components/ApiKeysTable.tsx
index c9a13a2d..1fcae24d 100644
--- a/src/components/ApiKeysTable.tsx
+++ b/src/components/ApiKeysTable.tsx
@@ -177,7 +177,7 @@ export default function ApiKeysTable({ apiKeys }: ApiKeyTableProps) {
                         setSelected(null);
                     }}
                     dialog={
-                        <div className="space-y-4">
+                        <div>
                             <p>
                                 {t("apiKeysQuestionRemove")}
                             </p>
diff --git a/src/components/ClientsTable.tsx b/src/components/ClientsTable.tsx
index ed820a29..95a6b55d 100644
--- a/src/components/ClientsTable.tsx
+++ b/src/components/ClientsTable.tsx
@@ -277,7 +277,7 @@ export default function ClientsTable({ clients, orgId }: ClientTableProps) {
                         setSelectedClient(null);
                     }}
                     dialog={
-                        <div className="space-y-4">
+                        <div>
                             <p>
                                 {t("deleteClientQuestion")}
                             </p>
diff --git a/src/components/DomainsTable.tsx b/src/components/DomainsTable.tsx
index b051a8eb..ca8d2a7c 100644
--- a/src/components/DomainsTable.tsx
+++ b/src/components/DomainsTable.tsx
@@ -237,7 +237,7 @@ export default function DomainsTable({ domains }: Props) {
                         setSelectedDomain(null);
                     }}
                     dialog={
-                        <div className="space-y-4">
+                        <div>
                             <p>
                                 {t("domainQuestionRemove")}
                             </p>
diff --git a/src/components/InvitationsTable.tsx b/src/components/InvitationsTable.tsx
index d933d518..20a9755b 100644
--- a/src/components/InvitationsTable.tsx
+++ b/src/components/InvitationsTable.tsx
@@ -175,7 +175,7 @@ export default function InvitationsTable({
                     setSelectedInvitation(null);
                 }}
                 dialog={
-                    <div className="space-y-4">
+                    <div>
                         <p>
                             {t("inviteQuestionRemove")}
                         </p>
diff --git a/src/components/OrgApiKeysTable.tsx b/src/components/OrgApiKeysTable.tsx
index a87c3293..61c14024 100644
--- a/src/components/OrgApiKeysTable.tsx
+++ b/src/components/OrgApiKeysTable.tsx
@@ -185,7 +185,7 @@ export default function OrgApiKeysTable({
                         setSelected(null);
                     }}
                     dialog={
-                        <div className="space-y-4">
+                        <div>
                             <p>
                                 {t("apiKeysQuestionRemove")}
                             </p>
diff --git a/src/components/UsersTable.tsx b/src/components/UsersTable.tsx
index be8aea49..b6827dff 100644
--- a/src/components/UsersTable.tsx
+++ b/src/components/UsersTable.tsx
@@ -273,20 +273,11 @@ export default function UsersTable({ users: u }: UsersTableProps) {
                     setSelectedUser(null);
                 }}
                 dialog={
-                    <div className="space-y-4">
+                    <div>
                         <p>
-                            {t("userQuestionOrgRemove", {
-                                email:
-                                    selectedUser?.email ||
-                                    selectedUser?.name ||
-                                    selectedUser?.username ||
-                                    ""
-                            })}
+                            {t("userQuestionOrgRemove")}
                         </p>
-
                         <p>{t("userMessageOrgRemove")}</p>
-
-                        <p>{t("userMessageOrgConfirm")}</p>
                     </div>
                 }
                 buttonText={t("userRemoveOrgConfirm")}
diff --git a/src/components/private/OrgIdpTable.tsx b/src/components/private/OrgIdpTable.tsx
index 014e78f6..059d175f 100644
--- a/src/components/private/OrgIdpTable.tsx
+++ b/src/components/private/OrgIdpTable.tsx
@@ -177,7 +177,7 @@ export default function IdpTable({ idps, orgId }: Props) {
                         setSelectedIdp(null);
                     }}
                     dialog={
-                        <div className="space-y-4">
+                        <div>
                             <p>
                                 {t("idpQuestionRemove")}
                             </p>