diff --git a/server/src/modules/auth/oauth/service.ts b/server/src/modules/auth/oauth/service.ts
index 734380df11..79b2c41fa2 100644
--- a/server/src/modules/auth/oauth/service.ts
+++ b/server/src/modules/auth/oauth/service.ts
@@ -221,7 +221,7 @@ export class OauthService implements IOAuthService {
             if (!isInviteRedirect) {
               // no SSO login enabled organization available for user - creating new one
               const { name, slug } = generateNextNameAndSlug('My workspace');
-              organizationDetails = await this.setupOrganizationsUtilService.create(name, slug, null, manager);
+              organizationDetails = await this.setupOrganizationsUtilService.create(name, slug, userDetails, manager);
               await this.userRepository.updateOne(
                 userDetails.id,
                 { defaultOrganizationId: organizationDetails.id },
diff --git a/server/src/modules/auth/service.ts b/server/src/modules/auth/service.ts
index b67d205b5d..c555847eaa 100644
--- a/server/src/modules/auth/service.ts
+++ b/server/src/modules/auth/service.ts
@@ -19,6 +19,7 @@ import { UserRepository } from '../users/repository';
 import { AuthUtilService } from './util.service';
 import { SessionUtilService } from '../session/util.service';
 import { IAuthService } from './interfaces/IService';
+import { SetupOrganizationsUtilService } from '@modules/setup-organization/util.service';
 
 @Injectable()
 export class AuthService implements IAuthService {
@@ -28,6 +29,7 @@ export class AuthService implements IAuthService {
     protected sessionUtilService: SessionUtilService,
     protected organizationRepository: OrganizationRepository,
     protected instanceSettingsUtilService: InstanceSettingsUtilService,
+    protected setupOrganizationsUtilService: SetupOrganizationsUtilService,
     protected eventEmitter: EventEmitter2
   ) {}
 
@@ -81,7 +83,7 @@ export class AuthService implements IAuthService {
         } else if (allowPersonalWorkspace && !isInviteRedirect) {
           // no form login enabled organization available for user - creating new one
           const { name, slug } = generateNextNameAndSlug('My workspace');
-          organization = await this.organizationRepository.createOne(name, slug, manager);
+          organization = await this.setupOrganizationsUtilService.create(name, slug, user, manager);
         } else {
           if (!isInviteRedirect) throw new UnauthorizedException('User is not assigned to any workspaces');
         }