diff --git a/apps/server/src/core/auth/services/auth.service.ts b/apps/server/src/core/auth/services/auth.service.ts
index e1a562a4..2d86fadf 100644
--- a/apps/server/src/core/auth/services/auth.service.ts
+++ b/apps/server/src/core/auth/services/auth.service.ts
@@ -1,7 +1,6 @@
 import { Injectable, UnauthorizedException } from '@nestjs/common';
 import { LoginDto } from '../dto/login.dto';
 import { CreateUserDto } from '../dto/create-user.dto';
-import { UserService } from '../../user/user.service';
 import { TokenService } from './token.service';
 import { TokensDto } from '../dto/tokens.dto';
 import { SignupService } from './signup.service';
@@ -12,14 +11,17 @@ import { comparePasswordHash } from '../../../helpers/utils';
 @Injectable()
 export class AuthService {
   constructor(
-    private userService: UserService,
     private signupService: SignupService,
     private tokenService: TokenService,
     private userRepo: UserRepo,
   ) {}
 
   async login(loginDto: LoginDto, workspaceId: string) {
-    const user = await this.userRepo.findByEmail(loginDto.email, workspaceId);
+    const user = await this.userRepo.findByEmail(
+      loginDto.email,
+      workspaceId,
+      true,
+    );
 
     if (
       !user ||
diff --git a/apps/server/src/core/auth/services/signup.service.ts b/apps/server/src/core/auth/services/signup.service.ts
index 3c5c8936..76e47058 100644
--- a/apps/server/src/core/auth/services/signup.service.ts
+++ b/apps/server/src/core/auth/services/signup.service.ts
@@ -2,7 +2,6 @@ import { BadRequestException, Injectable } from '@nestjs/common';
 import { CreateUserDto } from '../dto/create-user.dto';
 import { WorkspaceService } from '../../workspace/services/workspace.service';
 import { CreateWorkspaceDto } from '../../workspace/dto/create-workspace.dto';
-import { SpaceService } from '../../space/services/space.service';
 import { CreateAdminUserDto } from '../dto/create-admin-user.dto';
 import { GroupUserService } from '../../group/services/group-user.service';
 import { UserRepo } from '@docmost/db/repos/user/user.repo';
@@ -16,7 +15,6 @@ export class SignupService {
   constructor(
     private userRepo: UserRepo,
     private workspaceService: WorkspaceService,
-    private spaceService: SpaceService,
     private groupUserService: GroupUserService,
     @InjectKysely() private readonly db: KyselyDB,
   ) {}
@@ -63,7 +61,11 @@ export class SignupService {
     );
   }
 
-  async createWorkspace(user, workspaceName, trx?: KyselyTransaction) {
+  async createWorkspace(
+    user: User,
+    workspaceName: string,
+    trx?: KyselyTransaction,
+  ) {
     return await executeTx(
       this.db,
       async (trx) => {
diff --git a/apps/server/src/core/group/dto/create-group.dto.ts b/apps/server/src/core/group/dto/create-group.dto.ts
index 73c6d3b8..ce05d426 100644
--- a/apps/server/src/core/group/dto/create-group.dto.ts
+++ b/apps/server/src/core/group/dto/create-group.dto.ts
@@ -12,5 +12,5 @@ export class CreateGroupDto {
 }
 
 export enum DefaultGroup {
-  EVERYONE = 'users',
+  EVERYONE = 'internal_users',
 }
diff --git a/apps/server/src/core/group/services/group-user.service.ts b/apps/server/src/core/group/services/group-user.service.ts
index 95e532ee..fb5e8b39 100644
--- a/apps/server/src/core/group/services/group-user.service.ts
+++ b/apps/server/src/core/group/services/group-user.service.ts
@@ -63,7 +63,7 @@ export class GroupUserService {
     await executeTx(
       this.db,
       async (trx) => {
-        await this.groupService.findAndValidateGroup(groupId, workspaceId);
+        // await this.groupService.findAndValidateGroup(groupId, workspaceId);
         const groupUserExists = await this.groupUserRepo.getGroupUserById(
           userId,
           groupId,
diff --git a/apps/server/src/core/workspace/services/workspace-user.service.ts b/apps/server/src/core/workspace/services/workspace-user.service.ts
index 3ab9797d..74b8aaaa 100644
--- a/apps/server/src/core/workspace/services/workspace-user.service.ts
+++ b/apps/server/src/core/workspace/services/workspace-user.service.ts
@@ -5,15 +5,11 @@ import { PaginationMetaDto } from '../../../helpers/pagination/pagination-meta-d
 import { PaginatedResult } from '../../../helpers/pagination/paginated-result';
 import { UserRole } from '../../../helpers/types/permission';
 import { UserRepo } from '@docmost/db/repos/user/user.repo';
-import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo';
 import { User } from '@docmost/db/types/entity.types';
 
 @Injectable()
 export class WorkspaceUserService {
-  constructor(
-    private workspaceRepo: WorkspaceRepo,
-    private userRepo: UserRepo,
-  ) {}
+  constructor(private userRepo: UserRepo) {}
 
   async getWorkspaceUsers(
     workspaceId: string,
diff --git a/apps/server/src/core/workspace/services/workspace.service.ts b/apps/server/src/core/workspace/services/workspace.service.ts
index 98370b54..2dd7b93b 100644
--- a/apps/server/src/core/workspace/services/workspace.service.ts
+++ b/apps/server/src/core/workspace/services/workspace.service.ts
@@ -78,9 +78,8 @@ export class WorkspaceService {
           .execute();
 
         // add user to default group
-        await this.groupUserService.addUserToGroup(
+        await this.groupUserService.addUserToDefaultGroup(
           user.id,
-          group.id,
           workspace.id,
           trx,
         );
@@ -124,6 +123,7 @@ export class WorkspaceService {
           workspace.id,
           trx,
         );
+
         return workspace;
       },
       trx,
diff --git a/apps/server/src/kysely/repos/group/group.repo.ts b/apps/server/src/kysely/repos/group/group.repo.ts
index 30575efb..e065dc4a 100644
--- a/apps/server/src/kysely/repos/group/group.repo.ts
+++ b/apps/server/src/kysely/repos/group/group.repo.ts
@@ -74,7 +74,6 @@ export class GroupRepo {
           .selectAll()
           .where('isDefault', '=', true)
           .where('workspaceId', '=', workspaceId)
-
           .executeTakeFirst();
       },
       trx,