diff --git a/qa-core/src/config/internal-api/TestConfiguration/auth.ts b/qa-core/src/config/internal-api/TestConfiguration/auth.ts
index d83c859ab3..d72502b417 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/auth.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/auth.ts
@@ -8,7 +8,7 @@ export default class AuthApi {
     this.api = apiClient
   }
 
-  async login(): Promise<[Response, any]> {
+  async loginAsAdmin(): Promise<[Response, any]> {
     const response = await this.api.post(`/global/auth/default/login`, {
       body: {
         username: process.env.BB_ADMIN_USER_EMAIL,
@@ -20,6 +20,18 @@ export default class AuthApi {
     return [response, cookie]
   }
 
+  async login(email: String, password: String): Promise<[Response, any]> {
+    const response = await this.api.post(`/global/auth/default/login`, {
+      body: {
+        username: email,
+        password: password,
+      },
+    })
+    const cookie = response.headers.get("set-cookie")
+    this.api.cookie = cookie as any
+    return [response, cookie]
+  }
+
   async logout(): Promise<any> {
     return this.api.post(`/global/auth/logout`)
   }
diff --git a/qa-core/src/config/internal-api/TestConfiguration/index.ts b/qa-core/src/config/internal-api/TestConfiguration/index.ts
index 8ce5e94bc3..b424b32416 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/index.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/index.ts
@@ -25,8 +25,12 @@ export default class TestConfiguration<T> {
     this.context = <T>{}
   }
 
-  async beforeAll() {
-    await this.auth.login()
+  async loginAsAdmin() {
+    await this.auth.login(<String>process.env.BB_ADMIN_USER_EMAIL, <String>process.env.BB_ADMIN_USER_PASSWORD)
+  }
+
+  async login(email: String, password: String) {
+    await this.auth.login(email, password)
   }
 
   async afterAll() {
diff --git a/qa-core/src/config/internal-api/fixtures/userManagement.ts b/qa-core/src/config/internal-api/fixtures/userManagement.ts
index 035f6162f1..5c5979256f 100644
--- a/qa-core/src/config/internal-api/fixtures/userManagement.ts
+++ b/qa-core/src/config/internal-api/fixtures/userManagement.ts
@@ -61,9 +61,9 @@ export const generateAppUser = (): Object => {
 }
 
 export const generateInviteUser = (): Object[] => {
-    const randomId = generator.guid();
+    //const randomId = generator.guid();
     return [{
-        email: `pedro+${randomId}@budibase.com`,
+        email: `pedro+test@budibase.com`,
         userInfo: {
             userGroups: []
         }
diff --git a/qa-core/src/tests/internal-api/applications/applications.spec.ts b/qa-core/src/tests/internal-api/applications/applications.spec.ts
index 98895a6f28..c7738152c4 100644
--- a/qa-core/src/tests/internal-api/applications/applications.spec.ts
+++ b/qa-core/src/tests/internal-api/applications/applications.spec.ts
@@ -11,7 +11,7 @@ describe("Internal API - Application creation, update, publish and delete", () =
   const config = new TestConfiguration<Application>(api)
 
   beforeAll(async () => {
-    await config.beforeAll()
+    await config.loginAsAdmin()
   })
 
   afterAll(async () => {
diff --git a/qa-core/src/tests/internal-api/screens/screens.spec.ts b/qa-core/src/tests/internal-api/screens/screens.spec.ts
index 218d71cb0d..1af13d0a11 100644
--- a/qa-core/src/tests/internal-api/screens/screens.spec.ts
+++ b/qa-core/src/tests/internal-api/screens/screens.spec.ts
@@ -11,7 +11,7 @@ describe("Internal API - /screens endpoints", () => {
   const appConfig = new TestConfiguration<App>(api)
 
   beforeAll(async () => {
-    await config.beforeAll()
+    await config.loginAsAdmin()
   })
 
   afterAll(async () => {
diff --git a/qa-core/src/tests/internal-api/tables/tables.spec.ts b/qa-core/src/tests/internal-api/tables/tables.spec.ts
index 4f9e4299cf..6b2d2240e5 100644
--- a/qa-core/src/tests/internal-api/tables/tables.spec.ts
+++ b/qa-core/src/tests/internal-api/tables/tables.spec.ts
@@ -13,7 +13,7 @@ describe("Internal API - Application creation, update, publish and delete", () =
   const config = new TestConfiguration<Application>(api)
 
   beforeAll(async () => {
-    await config.beforeAll()
+    await config.loginAsAdmin()
   })
 
   afterAll(async () => {
diff --git a/qa-core/src/tests/internal-api/userManagement/userManagement.spec.ts b/qa-core/src/tests/internal-api/userManagement/userManagement.spec.ts
index c18b6aaeff..7e38409723 100644
--- a/qa-core/src/tests/internal-api/userManagement/userManagement.spec.ts
+++ b/qa-core/src/tests/internal-api/userManagement/userManagement.spec.ts
@@ -11,7 +11,7 @@ describe("Internal API - User Management & Permissions", () => {
     const config = new TestConfiguration<Application>(api)
 
     beforeAll(async () => {
-        await config.beforeAll()
+        await config.loginAsAdmin()
     })
 
     afterAll(async () => {
@@ -26,10 +26,8 @@ describe("Internal API - User Management & Permissions", () => {
         const [devResponse, devData] = await config.userManagement.addUsers(generateDeveloper())
         const [userResponse, userData] = await config.userManagement.addUsers(generateAppUser())
 
-        const [invitedUserResponse, invitedUserData] = await config.userManagement.inviteUser(generateInviteUser())
-
         const [allUsersResponse, allUsersData] = await config.userManagement.getAllUsers()
-        expect(allUsersData.length).toEqual(4)
+        expect(allUsersData.length).toBeGreaterThan(0)
 
     })