diff --git a/playwright/support/setup.ts b/playwright/support/setup.ts
index c85fd2127..04ca0f2ba 100644
--- a/playwright/support/setup.ts
+++ b/playwright/support/setup.ts
@@ -4,7 +4,7 @@
  */
 
 import { test as setup } from '@playwright/test'
-import { configureNextcloud, getContainer } from '@nextcloud/cypress/docker'
+import { configureNextcloud } from '@nextcloud/cypress/docker'
 
 /**
  * We use this to ensure Nextcloud is configured correctly before running our tests
@@ -13,5 +13,5 @@ import { configureNextcloud, getContainer } from '@nextcloud/cypress/docker'
  * as that only checks for the URL to be accessible which happens already before everything is configured.
  */
 setup('Configure Nextcloud', async () => {
-	await configureNextcloud(['forms', 'viewer'], undefined, getContainer())
+	await configureNextcloud(['forms'])
 })
diff --git a/playwright/support/utils/session.ts b/playwright/support/utils/session.ts
index 7038e8c2f..990f91ad8 100644
--- a/playwright/support/utils/session.ts
+++ b/playwright/support/utils/session.ts
@@ -91,15 +91,20 @@ export async function login(
 	password: string,
 ) {
 	const tokenResponse = await request.get('./csrftoken')
+	expect(tokenResponse.status()).toBe(200)
 	const requesttoken = (await tokenResponse.json()).token
 
-	await request.post('./login', {
+	const loginResponse = await request.post('./login', {
 		form: {
 			user,
 			password,
 			requesttoken,
 		},
+		headers: {
+			Origin: tokenResponse.url().replace(/index.php.*/, ''),
+		},
 	})
+	expect(loginResponse.status()).toBe(200)
 
 	const response = await request.get('apps/files')
 	expect(response.status()).toBe(200)