diff --git a/apps/api/v2/src/ee/event-types/controllers/event-types.controller.e2e-spec.ts b/apps/api/v2/src/ee/event-types/controllers/event-types.controller.e2e-spec.ts
index 821458499e..34feeb2955 100644
--- a/apps/api/v2/src/ee/event-types/controllers/event-types.controller.e2e-spec.ts
+++ b/apps/api/v2/src/ee/event-types/controllers/event-types.controller.e2e-spec.ts
@@ -59,7 +59,7 @@ describe("Event types Endpoints", () => {
     let teamRepositoryFixture: TeamRepositoryFixture;
     let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
 
-    const userEmail = "test-e2e@api.com";
+    const userEmail = "event-types-test-e2e@api.com";
     let eventType: EventType;
     let user: User;
 
@@ -153,7 +153,11 @@ describe("Event types Endpoints", () => {
       await oauthClientRepositoryFixture.delete(oAuthClient.id);
       await teamRepositoryFixture.delete(organization.id);
       await eventTypesRepositoryFixture.delete(eventType.id);
-
+      try {
+        await userRepositoryFixture.delete(user.id);
+      } catch (e) {
+        // User might have been deleted by the test
+      }
       await app.close();
     });
   });
diff --git a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts
index d1abb8d3aa..7828ac5d30 100644
--- a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts
+++ b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts
@@ -169,7 +169,8 @@ describe("OAuth Client Users Endpoints", () => {
     async function userHasDefaultEventTypes(userId: number) {
       const defaultEventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(userId);
 
-      expect(defaultEventTypes?.length).toEqual(2);
+      // note(Lauris): to determine count see default event types created in EventTypesService.createUserDefaultEventTypes
+      expect(defaultEventTypes?.length).toEqual(4);
       expect(
         defaultEventTypes?.find((eventType) => eventType.length === DEFAULT_EVENT_TYPES.thirtyMinutes.length)
       ).toBeTruthy();
@@ -221,7 +222,11 @@ describe("OAuth Client Users Endpoints", () => {
     afterAll(async () => {
       await oauthClientRepositoryFixture.delete(oAuthClient.id);
       await teamRepositoryFixture.delete(organization.id);
-
+      try {
+        await userRepositoryFixture.delete(postResponseData.user.id);
+      } catch (e) {
+        // User might have been deleted by the test
+      }
       await app.close();
     });
   });
diff --git a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.ts b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.ts
index e98b2c6798..f53ee7f1b8 100644
--- a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.ts
+++ b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.ts
@@ -155,10 +155,6 @@ export class OAuthClientUsersController {
       throw new NotFoundException(`User with ${userId} does not exist`);
     }
 
-    if (existingUser.username) {
-      throw new BadRequestException("Cannot delete a non manually-managed user");
-    }
-
     const user = await this.userRepository.delete(userId);
 
     return {
diff --git a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.e2e-spec.ts b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.e2e-spec.ts
index d6ee98661c..c94e0328fb 100644
--- a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.e2e-spec.ts
+++ b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.e2e-spec.ts
@@ -65,7 +65,7 @@ describe("OAuth Clients Endpoints", () => {
     let user: User;
     let org: Team;
     let app: INestApplication;
-    const userEmail = "test-e2e@api.com";
+    const userEmail = "oauth-clients-test-e2e@api.com";
 
     beforeAll(async () => {
       const moduleRef = await withNextAuth(
diff --git a/apps/api/v2/src/modules/users/inputs/create-user.input.ts b/apps/api/v2/src/modules/users/inputs/create-user.input.ts
index 72d8b91901..0d13750aa4 100644
--- a/apps/api/v2/src/modules/users/inputs/create-user.input.ts
+++ b/apps/api/v2/src/modules/users/inputs/create-user.input.ts
@@ -15,10 +15,6 @@ export class CreateUserInput {
   @Validate(IsTimeFormat)
   timeFormat?: number;
 
-  @IsNumber()
-  @IsOptional()
-  defaultScheduleId?: number;
-
   @IsString()
   @IsOptional()
   @Validate(IsWeekStart)