diff --git a/packages/server-nest/src/modules/Auth/AuthApplication.sevice.ts b/packages/server-nest/src/modules/Auth/AuthApplication.sevice.ts
index a4a8cd2d9..6b14892c9 100644
--- a/packages/server-nest/src/modules/Auth/AuthApplication.sevice.ts
+++ b/packages/server-nest/src/modules/Auth/AuthApplication.sevice.ts
@@ -23,7 +23,6 @@ export class AuthenticationApplication {
 
   /**
    * Signin and generates JWT token.
-   * @throws {ServiceError}
    * @param {string} email - Email address.
    * @param {string} password - Password.
    */
diff --git a/packages/server-nest/src/modules/Auth/commands/AuthSignup.service.ts b/packages/server-nest/src/modules/Auth/commands/AuthSignup.service.ts
index ba38fa0d6..94b73ba1b 100644
--- a/packages/server-nest/src/modules/Auth/commands/AuthSignup.service.ts
+++ b/packages/server-nest/src/modules/Auth/commands/AuthSignup.service.ts
@@ -80,6 +80,7 @@ export class AuthSignupService {
     return {
       userId: user.id,
       tenantId: user.tenantId,
+      organizationId: tenant.organizationId,
     };
   }
 
diff --git a/packages/server-nest/src/modules/Organization/Organization.controller.ts b/packages/server-nest/src/modules/Organization/Organization.controller.ts
index b75b38a42..aafcced04 100644
--- a/packages/server-nest/src/modules/Organization/Organization.controller.ts
+++ b/packages/server-nest/src/modules/Organization/Organization.controller.ts
@@ -53,7 +53,7 @@ export class OrganizationController {
     });
   }
 
-  @Get()
+  @Get('current')
   @ApiOperation({ summary: 'Get current organization' })
   @ApiResponse({
     status: 200,
diff --git a/packages/server-nest/src/modules/Organization/processors/OrganizationBuild.processor.ts b/packages/server-nest/src/modules/Organization/processors/OrganizationBuild.processor.ts
index 490626d9d..6eca5d010 100644
--- a/packages/server-nest/src/modules/Organization/processors/OrganizationBuild.processor.ts
+++ b/packages/server-nest/src/modules/Organization/processors/OrganizationBuild.processor.ts
@@ -25,7 +25,7 @@ export class OrganizationBuildProcessor extends WorkerHost {
   @Process(OrganizationBuildQueueJob)
   @UseCls()
   async process(job: Job<OrganizationBuildQueueJobPayload>) {
-    console.log('Processing organization build job:', job.data);
+    console.log('Processing organization build job:', job.id);
 
       this.clsService.set('organizationId', job.data.organizationId);
       this.clsService.set('userId', job.data.userId);
diff --git a/packages/server-nest/src/modules/SaleInvoices/queries/GetInvoicePaymentMailAttributes.transformer.ts b/packages/server-nest/src/modules/SaleInvoices/queries/GetInvoicePaymentMailAttributes.transformer.ts
index 1ca1e81b5..4783288a8 100644
--- a/packages/server-nest/src/modules/SaleInvoices/queries/GetInvoicePaymentMailAttributes.transformer.ts
+++ b/packages/server-nest/src/modules/SaleInvoices/queries/GetInvoicePaymentMailAttributes.transformer.ts
@@ -126,7 +126,6 @@ class GetInvoiceMailTemplateItemAttrsTransformer extends Transformer {
   }
 
   public label(entry): string {
-    console.log(entry);
     return entry?.item?.name;
   }
 
diff --git a/packages/server-nest/test/organization.e2e-spec.ts b/packages/server-nest/test/organization.e2e-spec.ts
new file mode 100644
index 000000000..02f1abf97
--- /dev/null
+++ b/packages/server-nest/test/organization.e2e-spec.ts
@@ -0,0 +1,74 @@
+import * as request from 'supertest';
+import { faker } from '@faker-js/faker';
+import { app } from './init-app-test';
+
+let signinResponse = null;
+let signupResponse = null;
+
+describe('Organization (e2e)', () => {
+  beforeAll(async () => {
+    const signupBody = {
+      firstName: faker.person.firstName(),
+      lastName: faker.person.lastName(),
+      email: faker.internet.email(),
+      password: '123123123',
+    };
+    signupResponse = await request(app.getHttpServer())
+      .post('/auth/signup')
+      .send(signupBody);
+
+    signinResponse = await request(app.getHttpServer())
+      .post('/auth/signin')
+      .send({
+        email: signupBody.email,
+        password: signupBody.password,
+      });
+  });
+
+  it('/organization (POST)', async () => {    
+    return request(app.getHttpServer())
+      .post('/organization/build')
+      .set('Accept', 'application/json')
+      .set('Content-Type', 'application/json')
+      .set('Authorization', `Bearer ${signinResponse.body.access_token}`)
+      .set('organization-id', signupResponse.body.organization_id)
+      .send({
+        name: 'BIGCAPITAL, INC',
+        baseCurrency: 'USD',
+        location: 'US',
+        language: 'en',
+        fiscalYear: 'march',
+        timezone: 'US/Central',
+      })
+      .expect(200);
+  });
+
+  it('/organization (GET)', () => {
+    return request(app.getHttpServer())
+    .get('/organization/current')
+    .set('Accept', 'application/json')
+    .set('Content-Type', 'application/json')
+    .set('Authorization', `Bearer ${signinResponse.body.access_token}`)
+    .set('organization-id', signupResponse.body.organization_id)
+    .send()
+    .expect(200);
+  });
+
+  it('/organization (PUT)', () => {
+    return request(app.getHttpServer())
+      .put('/organization')
+      .set('Accept', 'application/json')
+      .set('Content-Type', 'application/json')
+      .set('Authorization', `Bearer ${signinResponse.body.access_token}`)
+      .set('organization-id', signupResponse.body.organization_id)
+      .send({
+        name: 'BIGCAPITAL, INC',
+        baseCurrency: 'USD',
+        location: 'US',
+        language: 'en',
+        fiscalYear: 'march',
+        timezone: 'US/Central',
+      })
+      .expect(200);
+  });
+});