diff --git a/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx b/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx
index ba50a278d52..509f451a592 100644
--- a/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx
+++ b/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx
@@ -90,7 +90,7 @@ export default function FacilityOrganizationUsers({ id, facilityId }: Props) {
           </div>
         </div>
 
-        <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
+        <div className="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-4">
           {users?.results?.length === 0 ? (
             <Card className="col-span-full">
               <CardContent className="p-6 text-center text-gray-500">
@@ -115,7 +115,7 @@ export default function FacilityOrganizationUsers({ id, facilityId }: Props) {
                             {userRole.user.first_name} {userRole.user.last_name}
                           </h1>
                           <span className="text-sm text-gray-500">
-                            <span className="mr-2">
+                            <span className="mr-2 break-words">
                               {userRole.user.username}
                             </span>
                             <UserStatusIndicator user={userRole.user} />
diff --git a/src/pages/Organization/components/AddUserSheet.tsx b/src/pages/Organization/components/AddUserSheet.tsx
index b6054eb4a56..1efba82ca81 100644
--- a/src/pages/Organization/components/AddUserSheet.tsx
+++ b/src/pages/Organization/components/AddUserSheet.tsx
@@ -33,7 +33,7 @@ export default function AddUserSheet({
   return (
     <Sheet open={open} onOpenChange={setOpen}>
       <SheetTrigger asChild>
-        <Button variant="outline" data-cy="add-user-button">
+        <Button variant="outline" data-cy="add-user-button" className="ml-3">
           <CareIcon icon="l-plus" className="mr-2 h-4 w-4" />
           {t("add_user")}
         </Button>