diff --git a/src/space/services/space-user.service.ts b/src/space/services/space-user.service.ts
index 5bfb87b..d4f2e9d 100644
--- a/src/space/services/space-user.service.ts
+++ b/src/space/services/space-user.service.ts
@@ -51,9 +51,9 @@ export class SpaceUserService {
       );
     }
 
-    // Create a new UserSpaceEntity entry to associate the user and the space
     const userSpace = this.userSpaceRepository.create({ user, space });
 
+    await this.userSpaceRepository.save(userSpace);
     return new SuccessResponseDto({
       data: userSpace,
       message: `Space ${spaceUuid} has been successfully associated t user ${userUuid}`,
diff --git a/src/users/services/user-space.service.ts b/src/users/services/user-space.service.ts
index 579ff63..3dc565a 100644
--- a/src/users/services/user-space.service.ts
+++ b/src/users/services/user-space.service.ts
@@ -20,10 +20,9 @@ export class UserSpaceService {
       );
     }
 
-    const spaces = userSpaces.map((userSpace) => userSpace.space);
 
     return new SuccessResponseDto({
-      data: spaces,
+      data: userSpaces,
       message: `Spaces for user ${userUuid} retrieved successfully`,
     });
   }
diff --git a/src/users/user.module.ts b/src/users/user.module.ts
index 1cba860..61fc323 100644
--- a/src/users/user.module.ts
+++ b/src/users/user.module.ts
@@ -8,14 +8,14 @@ import {
 } from '@app/common/modules/user/repositories';
 import { RegionRepository } from '@app/common/modules/region/repositories';
 import { TimeZoneRepository } from '@app/common/modules/timezone/repositories';
-import { UserCommunityController } from './controllers';
+import { UserCommunityController, UserSpaceController } from './controllers';
 import { CommunityModule } from 'src/community/community.module';
-import { UserCommunityService } from './services';
+import { UserCommunityService, UserSpaceService } from './services';
 import { CommunityRepository } from '@app/common/modules/community/repositories';
 
 @Module({
   imports: [ConfigModule, CommunityModule],
-  controllers: [UserController, UserCommunityController],
+  controllers: [UserController, UserSpaceController, UserCommunityController],
   providers: [
     UserService,
     UserRepository,
@@ -24,6 +24,7 @@ import { CommunityRepository } from '@app/common/modules/community/repositories'
     UserSpaceRepository,
     CommunityRepository,
     UserCommunityService,
+    UserSpaceService,
   ],
   exports: [UserService],
 })