diff --git a/web/assets/js/components/PasswordChange.vue b/web/assets/js/components/PasswordChange.vue
index 2620d55..4a4e662 100755
--- a/web/assets/js/components/PasswordChange.vue
+++ b/web/assets/js/components/PasswordChange.vue
@@ -54,7 +54,7 @@
                     :type="passwordFieldType"
                     label="Passwort wiederholen"
                     placeholder="Passwort"
-                    ame="passwordRepeat"
+                    name="passwordRepeat"
                     data-test="passwordRepeat"
                     autocomplete="off"
                     hide
diff --git a/web/assets/js/components/Tags/TagCreate.vue b/web/assets/js/components/Tags/TagCreate.vue
index 0386348..19fd287 100755
--- a/web/assets/js/components/Tags/TagCreate.vue
+++ b/web/assets/js/components/Tags/TagCreate.vue
@@ -43,7 +43,7 @@
             </template>
         </v-select>
         <v-select
-            v-if="!isSuperAdmin"
+            v-if="isSuperAdmin"
             v-model="client"
             data-test="client"
             label="Für welchen Klienten?"
diff --git a/web/tests/Acceptance/features/tag_list.feature b/web/tests/Acceptance/features/tag_list.feature
index 651ecd6..c533a70 100755
--- a/web/tests/Acceptance/features/tag_list.feature
+++ b/web/tests/Acceptance/features/tag_list.feature
@@ -50,7 +50,6 @@ Feature: A user can do a walk
     And I wait for "Neuen Tag erstellen" to appear
     # open
     And I click on test element "header-tag-create"
-    And I wait for "PowderBlue" to appear
     And I wait for "client@gmx.de" to disappear
 
   @javascript
diff --git a/web/tests/Acceptance/features/team_change_minimal.feature b/web/tests/Acceptance/features/team_change_minimal.feature
index c6e591b..afd403f 100755
--- a/web/tests/Acceptance/features/team_change_minimal.feature
+++ b/web/tests/Acceptance/features/team_change_minimal.feature
@@ -32,8 +32,8 @@ Feature: An admin can change a team
 
         Then the element "button-team-form-change" should be enabled
         When I enter "Superteam" in "name-change" field
-        When I click on test element "change-users-karl@gmx.de"
-        When I click on test element "change-users-lonely@gmx.de"
+        When I click on test element "walkTeamMember-karl@gmx.de"
+        When I click on test element "walkTeamMember-lonely@gmx.de"
         Then the element "button-team-form-change" should be enabled
         Then I click on test element "button-team-form-change"
         Then I wait for "Das Team Superteam wurde erfolgreich geändert." to appear