diff --git a/acceptance/tests/login.ts b/acceptance/tests/login.ts
index 5732ae495c2..ff3c13e6f2a 100644
--- a/acceptance/tests/login.ts
+++ b/acceptance/tests/login.ts
@@ -19,6 +19,7 @@ export async function loginWithPasskey(page: Page, authenticatorId: string, user
 }
 
 export async function loginScreenExpect(page: Page, fullName: string) {
+    await expect(page).toHaveURL(/signedin.*/)
     await expect(page.getByRole('heading')).toContainText(fullName);
 }
 
diff --git a/acceptance/tests/passkey.ts b/acceptance/tests/passkey.ts
index 4e336e7732e..7284a102e81 100644
--- a/acceptance/tests/passkey.ts
+++ b/acceptance/tests/passkey.ts
@@ -107,4 +107,3 @@ async function simulateSuccessfulPasskeyInput(client: CDPSession, authenticatorI
     // wait to receive the event that the passkey was successfully registered or verified
     await operationCompleted;
 }
-s
\ No newline at end of file
diff --git a/acceptance/tests/user.ts b/acceptance/tests/user.ts
index b29fd9af46a..bf4f7b26620 100644
--- a/acceptance/tests/user.ts
+++ b/acceptance/tests/user.ts
@@ -1,8 +1,6 @@
 import fetch from "node-fetch";
 import {Page} from "@playwright/test";
 import {registerWithPasskey} from "./register";
-import {loginWithPassword} from "./login";
-import {changePassword} from "./password";
 import {getUserByUsername, removeUser} from './zitadel';
 
 export interface userProps {
@@ -59,7 +57,11 @@ class User {
     }
 
     async remove() {
-        await removeUser(this.getUserId())
+        const resp = await getUserByUsername(this.getUsername())
+        if (!resp || !resp.result || !resp.result[0]) {
+            return
+        }
+        await removeUser(resp.result[0].userId)
         return
     }
 
@@ -90,12 +92,6 @@ class User {
     public getFullName() {
         return this.props.firstName + " " + this.props.lastName
     }
-
-    public async doPasswordChange(page: Page, password: string) {
-        await loginWithPassword(page, this.getUsername(), this.getPassword())
-        await changePassword(page, this.getUsername(), password)
-        this.props.password = password
-    }
 }
 
 export class PasswordUser extends User {
@@ -191,11 +187,6 @@ export class PasskeyUser extends User {
     }
 
     public async remove() {
-        const resp = await getUserByUsername(this.getUsername())
-        if (!resp || !resp.result || !resp.result[0]) {
-            return
-        }
-        this.setUserId(resp.result[0].userId)
         await super.remove()
     }
 
diff --git a/acceptance/tests/username-password-otp_sms.spec.ts b/acceptance/tests/username-password-otp_sms.spec.ts
index 9caf8bd5ceb..0c733a6fafe 100644
--- a/acceptance/tests/username-password-otp_sms.spec.ts
+++ b/acceptance/tests/username-password-otp_sms.spec.ts
@@ -25,12 +25,12 @@ const test = base.extend<{ user: PasswordUserWithOTP }>({
 });
 
 test("username, password and otp login", async ({user, page}) => {
-    const server = startSink()
+    //const server = startSink()
     await loginWithPassword(page, user.getUsername(), user.getPassword())
 
 
     await loginScreenExpect(page, user.getFullName());
-    server.close()
+    //server.close()
 });