diff --git a/src/routes/console/[project]/users/_createTeam.svelte b/src/routes/console/[project]/users/_createTeam.svelte
index fa1981b52..7fd58254c 100644
--- a/src/routes/console/[project]/users/_createTeam.svelte
+++ b/src/routes/console/[project]/users/_createTeam.svelte
@@ -15,7 +15,7 @@
 
     const create = async () => {
         try {
-            const team = await sdkForProject.teams.create(id ? id : 'unique()', name);
+            const team = await sdkForProject.teams.create(id ?? 'unique()', name);
             name = '';
             showCreate = false;
             dispatch('created', team);
@@ -26,6 +26,10 @@
             });
         }
     };
+
+    $: if (!showDropdown) {
+        id = null;
+    }
 </script>
 
 <Form on:submit={create}>
diff --git a/src/routes/console/[project]/users/_createUser.svelte b/src/routes/console/[project]/users/_createUser.svelte
index 314ba30b9..882801dfd 100644
--- a/src/routes/console/[project]/users/_createUser.svelte
+++ b/src/routes/console/[project]/users/_createUser.svelte
@@ -22,7 +22,7 @@
 
     const create = async () => {
         try {
-            const user = await sdkForProject.users.create(id ? id : 'unique()', mail, pass, name);
+            const user = await sdkForProject.users.create(id ?? 'unique()', mail, pass, name);
             mail = pass = name = '';
             showCreate = false;
             dispatch('created', user);
@@ -33,6 +33,10 @@
             });
         }
     };
+
+    $: if (!showDropdown) {
+        id = null;
+    }
 </script>
 
 <Form on:submit={create}>