diff --git a/resources/scripts/components/server/users/UserRow.tsx b/resources/scripts/components/server/users/UserRow.tsx
index 08adecd78..ec20baa8e 100644
--- a/resources/scripts/components/server/users/UserRow.tsx
+++ b/resources/scripts/components/server/users/UserRow.tsx
@@ -49,21 +49,21 @@ export default ({ subuser }: Props) => {
                 <p css={tw`text-2xs text-neutral-500 uppercase`}>Permissions</p>
             </div>
             {subuser.uuid !== uuid &&
-                <Can action={'user.update'}>
-                    <button
-                        type={'button'}
-                        aria-label={'Edit subuser'}
-                        css={tw`block text-sm p-1 md:p-2 text-neutral-500 hover:text-neutral-100 transition-colors duration-150 mx-4`}
-                        onClick={() => setVisible(true)}
-                    >
-                        <FontAwesomeIcon icon={faPencilAlt}/>
-                    </button>
-                </Can>
-            }
-            {subuser.uuid !== uuid &&
-                <Can action={'user.delete'}>
-                    <RemoveSubuserButton subuser={subuser}/>
-                </Can>
+                <>
+                    <Can action={'user.update'}>
+                        <button
+                            type={'button'}
+                            aria-label={'Edit subuser'}
+                            css={tw`block text-sm p-1 md:p-2 text-neutral-500 hover:text-neutral-100 transition-colors duration-150 mx-4`}
+                            onClick={() => setVisible(true)}
+                        >
+                            <FontAwesomeIcon icon={faPencilAlt} />
+                        </button>
+                    </Can>
+                    <Can action={'user.delete'}>
+                        <RemoveSubuserButton subuser={subuser} />
+                    </Can>
+                </>
             }
         </GreyRowBox>
     );