diff --git a/frontend/src/features/register/Register.tsx b/frontend/src/features/register/Register.tsx
index 2103077..2b41e61 100644
--- a/frontend/src/features/register/Register.tsx
+++ b/frontend/src/features/register/Register.tsx
@@ -15,8 +15,8 @@ const Register = (): JSX.Element => {
     loading,
     showAll,
     setShowAll,
-    setSelectedUser,
     selectedUser,
+    toggleSelectedUser,
     addToOrder,
     order,
     total,
@@ -36,14 +36,14 @@ const Register = (): JSX.Element => {
           <UserCard
             key={USER_EXTERNAL}
             user={null}
-            onUser={() => setSelectedUser(USER_EXTERNAL)}
+            onUser={() => toggleSelectedUser(USER_EXTERNAL)}
             active={selectedUser == USER_EXTERNAL}
           />
           {users.map((user) => (
             <UserCard
               key={user.id}
               user={user}
-              onUser={() => setSelectedUser(user.id)}
+              onUser={() => toggleSelectedUser(user.id)}
               active={selectedUser == user.id}
             />
           ))}
diff --git a/frontend/src/features/register/useRegister.ts b/frontend/src/features/register/useRegister.ts
index fddb71c..7f7076c 100644
--- a/frontend/src/features/register/useRegister.ts
+++ b/frontend/src/features/register/useRegister.ts
@@ -38,6 +38,10 @@ export const useRegister = () => {
     setSelectedUser("");
   };
 
+  const toggleSelectedUser = (userId: string) => {
+    setSelectedUser(selectedUser == userId ? "" : userId);
+  };
+
   const addToOrder = (productId: string) => {
     let added = false;
     const newOrder = order.map((orderLine: OrderLineInput) => {
@@ -94,6 +98,7 @@ export const useRegister = () => {
     setShowAll,
     setSelectedUser,
     selectedUser,
+    toggleSelectedUser,
     addToOrder,
     order,
     total,