diff --git a/tests/Berufsschule_HAM.E2ETests/Helper/UsersHelper.cs b/tests/Berufsschule_HAM.E2ETests/Helper/UsersHelper.cs
index 8aad1b0..72e8aba 100644
--- a/tests/Berufsschule_HAM.E2ETests/Helper/UsersHelper.cs
+++ b/tests/Berufsschule_HAM.E2ETests/Helper/UsersHelper.cs
@@ -21,18 +21,8 @@ public static class UsersHelper
 
         driver.FindElement(By.Id("createWorkplace")).Click();
         AppHelper.AwaitVisible(driver, By.Id("createWorkplace"));
-        for (int i = 0; i < 5; i++)
-        {
-            try
-            {
-                driver.ExecuteJavaScript("document.getElementById(\"createWorkplace\").children[1].selected = true");
-                break;                
-            } catch (Exception)
-            {
-                Thread.Sleep(100);
-                if (i >= 4) throw;
-            }
-        }
+        AppHelper.AwaitVisible(driver, By.CssSelector("#createWorkplace>*"));
+        driver.ExecuteJavaScript("document.getElementById(\"createWorkplace\").children[1].selected = true");
         driver.FindElement(By.Id("createGroups")).FindElement(By.CssSelector("*")).Click();
 
         driver.FindElement(By.Id("createPassword")).SendKeys(AppHelper.GetRandomName() + "+42A");