diff --git a/backend/src/migrations/1721632351165-BalanceSheetAndNonPoliticalAffiliation.ts b/backend/src/migrations/1721632351165-BalanceSheetAndNonPoliticalAffiliation.ts
new file mode 100644
index 000000000..4e3f43de2
--- /dev/null
+++ b/backend/src/migrations/1721632351165-BalanceSheetAndNonPoliticalAffiliation.ts
@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class BalanceSheetAndNonPoliticalAffiliation1721632351165
+  implements MigrationInterface
+{
+  name = 'BalanceSheetAndNonPoliticalAffiliation1721632351165';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "organization_legal" ADD "balance_sheet_file" character varying`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_legal" ADD "non_political_affiliation_file" character varying`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "organization_legal" DROP COLUMN "non_political_affiliation_file"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_legal" DROP COLUMN "balance_sheet_file"`,
+    );
+  }
+}
diff --git a/backend/src/migrations/1721741119685-AddOrganizationAliasToUserApplicationsView.ts b/backend/src/migrations/1721741119685-AddOrganizationAliasToUserApplicationsView.ts
new file mode 100644
index 000000000..986bd3868
--- /dev/null
+++ b/backend/src/migrations/1721741119685-AddOrganizationAliasToUserApplicationsView.ts
@@ -0,0 +1,84 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddOrganizationAliasToUserApplicationsView1721741119685
+  implements MigrationInterface
+{
+  name = 'AddOrganizationAliasToUserApplicationsView1721741119685';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DELETE FROM "typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`,
+      ['VIEW', 'UserApplicationsView', 'public'],
+    );
+    await queryRunner.query(`DROP VIEW "UserApplicationsView"`);
+    await queryRunner.query(`CREATE VIEW "UserApplicationsView" AS 
+      SELECT u.id,
+          u.name,
+          u.email,
+          u.phone,
+          u.status,
+          u.role,
+          u.organization_id AS "organizationId",
+          u.created_on AS "createdOn",
+          u.updated_on AS "updatedOn",
+          og.alias as "organizationAlias",
+          array_agg(DISTINCT a.id) AS "availableAppsIDs",
+          json_agg(DISTINCT jsonb_build_object('id', a.id, 'name', a.name, 'type', a.type)) AS "availableApps"
+        FROM "user" u
+          LEFT JOIN user_ong_application uoa ON u.id = uoa.user_id AND uoa.status = 'active'::user_ong_application_status_enum
+          LEFT JOIN ong_application oa ON uoa.ong_application_id = oa.id AND oa.status = 'active'::ong_application_status_enum
+          LEFT JOIN application a ON (oa.application_id = a.id OR a.type = 'independent'::application_type_enum) AND a.status = 'active'::application_status_enum
+          LEFT JOIN organization o ON u.organization_id = o.id
+          LEFT JOIN organization_general og ON o.organization_general_id = og.id
+      WHERE u.role = 'employee'::user_role_enum AND (u.status = ANY (ARRAY['active'::user_status_enum, 'restricted'::user_status_enum])) AND u.deleted_on IS NULL
+      GROUP BY u.id, og.alias;
+
+  `);
+    await queryRunner.query(
+      `INSERT INTO "typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`,
+      [
+        'public',
+        'VIEW',
+        'UserApplicationsView',
+        "SELECT u.id,\n          u.name,\n          u.email,\n          u.phone,\n          u.status,\n          u.role,\n          u.organization_id AS \"organizationId\",\n          u.created_on AS \"createdOn\",\n          u.updated_on AS \"updatedOn\",\n          og.alias as \"organizationAlias\",\n          array_agg(DISTINCT a.id) AS \"availableAppsIDs\",\n          json_agg(DISTINCT jsonb_build_object('id', a.id, 'name', a.name, 'type', a.type)) AS \"availableApps\"\n        FROM \"user\" u\n          LEFT JOIN user_ong_application uoa ON u.id = uoa.user_id AND uoa.status = 'active'::user_ong_application_status_enum\n          LEFT JOIN ong_application oa ON uoa.ong_application_id = oa.id AND oa.status = 'active'::ong_application_status_enum\n          LEFT JOIN application a ON (oa.application_id = a.id OR a.type = 'independent'::application_type_enum) AND a.status = 'active'::application_status_enum\n          LEFT JOIN organization o ON u.organization_id = o.id\n          LEFT JOIN organization_general og ON o.organization_general_id = og.id\n      WHERE u.role = 'employee'::user_role_enum AND (u.status = ANY (ARRAY['active'::user_status_enum, 'restricted'::user_status_enum])) AND u.deleted_on IS NULL\n      GROUP BY u.id, og.alias;",
+      ],
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DELETE FROM "typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`,
+      ['VIEW', 'UserApplicationsView', 'public'],
+    );
+    await queryRunner.query(`DROP VIEW "UserApplicationsView"`);
+    await queryRunner.query(`CREATE VIEW "UserApplicationsView" AS SELECT u.id,
+          u.name,
+          u.email,
+          u.phone,
+          u.status,
+          u.role,
+          u.organization_id AS "organizationId",
+          u.created_on AS "createdOn",
+          u.updated_on AS "updatedOn",
+          og.alias,
+          array_agg(DISTINCT a.id) AS "availableAppsIDs",
+          json_agg(DISTINCT jsonb_build_object('id', a.id, 'name', a.name, 'type', a.type)) AS "availableApps"
+        FROM "user" u
+          LEFT JOIN user_ong_application uoa ON u.id = uoa.user_id AND uoa.status = 'active'::user_ong_application_status_enum
+          LEFT JOIN ong_application oa ON uoa.ong_application_id = oa.id AND oa.status = 'active'::ong_application_status_enum
+          LEFT JOIN application a ON (oa.application_id = a.id OR a.type = 'independent'::application_type_enum) AND a.status = 'active'::application_status_enum
+          LEFT JOIN organization o ON u.organization_id = o.id
+          LEFT JOIN organization_general og ON o.organization_general_id = og.id
+      WHERE u.role = 'employee'::user_role_enum AND (u.status = ANY (ARRAY['active'::user_status_enum, 'restricted'::user_status_enum])) AND u.deleted_on IS NULL
+      GROUP BY u.id, og.alias;`);
+    await queryRunner.query(
+      `INSERT INTO "typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`,
+      [
+        'public',
+        'VIEW',
+        'UserApplicationsView',
+        "SELECT u.id,\n          u.name,\n          u.email,\n          u.phone,\n          u.status,\n          u.role,\n          u.organization_id AS \"organizationId\",\n          u.created_on AS \"createdOn\",\n          u.updated_on AS \"updatedOn\",\n          og.alias,\n          array_agg(DISTINCT a.id) AS \"availableAppsIDs\",\n          json_agg(DISTINCT jsonb_build_object('id', a.id, 'name', a.name, 'type', a.type)) AS \"availableApps\"\n        FROM \"user\" u\n          LEFT JOIN user_ong_application uoa ON u.id = uoa.user_id AND uoa.status = 'active'::user_ong_application_status_enum\n          LEFT JOIN ong_application oa ON uoa.ong_application_id = oa.id AND oa.status = 'active'::ong_application_status_enum\n          LEFT JOIN application a ON (oa.application_id = a.id OR a.type = 'independent'::application_type_enum) AND a.status = 'active'::application_status_enum\n          LEFT JOIN organization o ON u.organization_id = o.id\n          LEFT JOIN organization_general og ON o.organization_general_id = og.id\n      WHERE u.role = 'employee'::user_role_enum AND (u.status = ANY (ARRAY['active'::user_status_enum, 'restricted'::user_status_enum])) AND u.deleted_on IS NULL\n      GROUP BY u.id, og.alias;",
+      ],
+    );
+  }
+}
diff --git a/backend/src/migrations/1721829705666-AddIssuer.ts b/backend/src/migrations/1721829705666-AddIssuer.ts
new file mode 100644
index 000000000..b9eaae49b
--- /dev/null
+++ b/backend/src/migrations/1721829705666-AddIssuer.ts
@@ -0,0 +1,34 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { ISSUERS } from './seed/issuers.seed';
+import { Issuer } from 'src/shared/entities';
+export class AddIssuer1721829705666 implements MigrationInterface {
+  name = 'AddIssuer1721829705666';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "_issuer" ("id" SERIAL NOT NULL, "deleted_on" TIMESTAMP WITH TIME ZONE, "created_on" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updated_on" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "name" text NOT NULL, CONSTRAINT "PK_cfe878b7aa3dc098f2ac736adc6" PRIMARY KEY ("id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_20b3d0cad6a13638d5d485eada" ON "_issuer" ("created_on") `,
+    );
+    await queryRunner.manager
+      .createQueryBuilder()
+      .insert()
+      .into(Issuer)
+      .values(ISSUERS)
+      .execute();
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.manager
+      .createQueryBuilder()
+      .delete()
+      .from(Issuer)
+      .execute();
+
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_20b3d0cad6a13638d5d485eada"`,
+    );
+    await queryRunner.query(`DROP TABLE "_issuer"`);
+  }
+}
diff --git a/backend/src/migrations/1721899705666-NewGeneralFields.ts b/backend/src/migrations/1721899705666-NewGeneralFields.ts
new file mode 100644
index 000000000..fc7d14b2c
--- /dev/null
+++ b/backend/src/migrations/1721899705666-NewGeneralFields.ts
@@ -0,0 +1,53 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class NewGeneralFields1721899705666 implements MigrationInterface {
+  name = 'NewGeneralFields1721899705666';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" ALTER COLUMN "raf_number" DROP NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" ADD "association_registry_number" text`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" ADD "association_registry_part" text`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" ADD "association_registry_section" text`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" ADD "association_registry_issuer_id" integer`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" ADD CONSTRAINT "FK_302f085592ed8a6c5d06f1182ef" FOREIGN KEY ("association_registry_issuer_id") REFERENCES "_issuer"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" ADD "national_registry_number" text`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" ALTER COLUMN "raf_number" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" DROP COLUMN "national_registry_number"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" DROP CONSTRAINT "FK_302f085592ed8a6c5d06f1182ef"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" DROP COLUMN "association_registry_issuer_id"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" DROP COLUMN "association_registry_section"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" DROP COLUMN "association_registry_part"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "organization_general" DROP COLUMN "association_registry_number"`,
+    );
+  }
+}
diff --git a/backend/src/migrations/1722099705666-SectorsSeed.ts b/backend/src/migrations/1722099705666-SectorsSeed.ts
new file mode 100644
index 000000000..da55d6569
--- /dev/null
+++ b/backend/src/migrations/1722099705666-SectorsSeed.ts
@@ -0,0 +1,27 @@
+import { City } from 'src/shared/entities';
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { SECTORS } from './seed/sectors.seed';
+
+export class SectorsSeed1722099705666 implements MigrationInterface {
+  name = 'SectorsSeed1722099705666';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.manager
+      .createQueryBuilder()
+      .insert()
+      .into(City)
+      .values(SECTORS)
+      .execute();
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    const sectorIds = SECTORS.map((sector) => sector.id);
+
+    await queryRunner.manager
+      .createQueryBuilder()
+      .delete()
+      .from(City)
+      .where('id IN (:...ids)', { ids: sectorIds })
+      .execute();
+  }
+}
diff --git a/backend/src/migrations/1722423180665-ContactRole.ts b/backend/src/migrations/1722423180665-ContactRole.ts
new file mode 100644
index 000000000..13e6b78da
--- /dev/null
+++ b/backend/src/migrations/1722423180665-ContactRole.ts
@@ -0,0 +1,13 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class ContactRole1722423180665 implements MigrationInterface {
+  name = 'ContactRole1722423180665';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "_contact" ADD "role" text`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "_contact" DROP COLUMN "role"`);
+  }
+}
diff --git a/backend/src/migrations/seed/city.seed.ts b/backend/src/migrations/seed/city.seed.ts
index f96d7d520..4de45a9dc 100644
--- a/backend/src/migrations/seed/city.seed.ts
+++ b/backend/src/migrations/seed/city.seed.ts
@@ -8899,11 +8899,11 @@ export const CITIES = [
     countyId: 33,
     name: 'Bucuresci',
   },
-  {
-    id: 1781,
-    countyId: 11,
-    name: 'Bucuresti',
-  },
+  // {
+  //   id: 1781,
+  //   countyId: 11,
+  //   name: 'Bucuresti',
+  // },
   {
     id: 1782,
     countyId: 6,
diff --git a/backend/src/migrations/seed/issuers.seed.ts b/backend/src/migrations/seed/issuers.seed.ts
new file mode 100644
index 000000000..299b11a9a
--- /dev/null
+++ b/backend/src/migrations/seed/issuers.seed.ts
@@ -0,0 +1,970 @@
+export const ISSUERS = [
+  {
+    id: 1,
+    name: 'Curtea de Apel ALBA IULIA',
+  },
+  {
+    id: 2,
+    name: 'Tribunalul ALBA',
+  },
+  {
+    id: 3,
+    name: 'Judecătoria AIUD',
+  },
+  {
+    id: 4,
+    name: 'Judecătoria ALBA IULIA',
+  },
+  {
+    id: 5,
+    name: 'Judecătoria BLAJ',
+  },
+  {
+    id: 6,
+    name: 'Judecătoria CÂMPENI',
+  },
+  {
+    id: 7,
+    name: 'Judecătoria SEBEŞ',
+  },
+  {
+    id: 8,
+    name: 'Tribunalul ARAD',
+  },
+  {
+    id: 9,
+    name: 'Judecătoria CHIŞINEU CRIŞ',
+  },
+  {
+    id: 10,
+    name: 'Judecătoria GURA HONŢ',
+  },
+  {
+    id: 11,
+    name: 'Judecătoria INEU',
+  },
+  {
+    id: 12,
+    name: 'Judecătoria LIPOVA',
+  },
+  {
+    id: 13,
+    name: 'Curtea de Apel PITEŞTI',
+  },
+  {
+    id: 14,
+    name: 'Tribunalul ARGEŞ',
+  },
+  {
+    id: 15,
+    name: 'Tribunalul Specializat ARGEŞ',
+  },
+  {
+    id: 16,
+    name: 'Judecătoria CĂMPULUNG',
+  },
+  {
+    id: 17,
+    name: 'Judecătoria COSTEŞTI',
+  },
+  {
+    id: 18,
+    name: 'Judecătoria CURTEA DE ARGEŞ',
+  },
+  {
+    id: 19,
+    name: 'Judecătoria PITEŞTI',
+  },
+  {
+    id: 20,
+    name: 'Judecătoria TOPOLOVENI',
+  },
+  {
+    id: 21,
+    name: 'Curtea de Apel BACĂU',
+  },
+  {
+    id: 22,
+    name: 'Tribunalul BACĂU',
+  },
+  {
+    id: 23,
+    name: 'Judecătoria BACĂU',
+  },
+  {
+    id: 24,
+    name: 'Judecătoria BUHUŞI',
+  },
+  {
+    id: 25,
+    name: 'Judecătoria MOINEŞTI',
+  },
+  {
+    id: 26,
+    name: 'Judecătoria ONEŞTI',
+  },
+  {
+    id: 27,
+    name: 'Judecătoria PODU TURCULUI',
+  },
+  {
+    id: 28,
+    name: 'Curtea de Apel ORADEA',
+  },
+  {
+    id: 29,
+    name: 'Tribunalul BIHOR',
+  },
+  {
+    id: 30,
+    name: 'Judecătoria ALESD',
+  },
+  {
+    id: 31,
+    name: 'Judecătoria BEIUŞ',
+  },
+  {
+    id: 32,
+    name: 'Judecătoria MARGHITA',
+  },
+  {
+    id: 33,
+    name: 'Judecătoria ORADEA',
+  },
+  {
+    id: 34,
+    name: 'Judecătoria SALONTA',
+  },
+  {
+    id: 35,
+    name: 'Tribunalul BISTRIŢA NĂSĂUD',
+  },
+  {
+    id: 36,
+    name: 'Judecătoria BECLEAN',
+  },
+  {
+    id: 37,
+    name: 'Judecătoria BISTRIŢA',
+  },
+  {
+    id: 38,
+    name: 'Judecătoria NĂSĂUD',
+  },
+  {
+    id: 39,
+    name: 'Tribunalul BOTOŞANI',
+  },
+  {
+    id: 40,
+    name: 'Judecătoria BOTOŞANI',
+  },
+  {
+    id: 41,
+    name: 'Judecătoria Darabani',
+  },
+  {
+    id: 42,
+    name: 'Judecătoria DOROHOI',
+  },
+  {
+    id: 43,
+    name: 'Judecătoria SĂVENI',
+  },
+  {
+    id: 44,
+    name: 'Tribunalul BRĂILA',
+  },
+  {
+    id: 45,
+    name: 'Judecătoria BRĂILA',
+  },
+  {
+    id: 46,
+    name: 'Judecătoria FĂUREI',
+  },
+  {
+    id: 47,
+    name: 'Judecătoria ÎNSURĂŢEI',
+  },
+  {
+    id: 48,
+    name: 'Curtea de Apel BRAŞOV',
+  },
+  {
+    id: 49,
+    name: 'Tribunalul BRAŞOV',
+  },
+  {
+    id: 50,
+    name: 'Tribunalul pentru minori şi familie BRAŞOV',
+  },
+  {
+    id: 51,
+    name: 'Judecătoria BRAŞOV',
+  },
+  {
+    id: 52,
+    name: 'Judecătoria FĂGĂRAŞ',
+  },
+  {
+    id: 53,
+    name: 'Judecătoria RUPEA',
+  },
+  {
+    id: 54,
+    name: 'Judecătoria ZĂRNEŞTI',
+  },
+  {
+    id: 55,
+    name: 'Curtea de Apel BUCUREŞTI',
+  },
+  {
+    id: 56,
+    name: 'Curtea Militara de Apel BUCUREŞTI',
+  },
+  {
+    id: 57,
+    name: 'Tribunalul BUCUREŞTI',
+  },
+  {
+    id: 58,
+    name: 'Tribunalul Militar BUCUREŞTI',
+  },
+  {
+    id: 59,
+    name: 'Tribunalul Militar Teritorial BUCUREŞTI',
+  },
+  {
+    id: 60,
+    name: 'Judecătoria SECTORUL 1 BUCUREŞTI',
+  },
+  {
+    id: 61,
+    name: 'Judecătoria SECTORUL 2 BUCUREŞTI',
+  },
+  {
+    id: 62,
+    name: 'Judecătoria SECTORUL 3 BUCUREŞTI',
+  },
+  {
+    id: 63,
+    name: 'Judecătoria SECTORUL 4 BUCUREŞTI',
+  },
+  {
+    id: 64,
+    name: 'Judecătoria SECTORUL 5 BUCUREŞTI',
+  },
+  {
+    id: 65,
+    name: 'Judecătoria SECTORUL 6 BUCUREŞTI',
+  },
+  {
+    id: 66,
+    name: 'Tribunalul BUZĂU',
+  },
+  {
+    id: 67,
+    name: 'Judecătoria BUZĂU',
+  },
+  {
+    id: 68,
+    name: 'Judecătoria PĂTÂRLAGELE',
+  },
+  {
+    id: 69,
+    name: 'Judecătoria POGOANELE',
+  },
+  {
+    id: 70,
+    name: 'Judecătoria RÂMNICU SARAT',
+  },
+  {
+    id: 71,
+    name: 'Tribunalul CĂLĂRAŞI',
+  },
+  {
+    id: 72,
+    name: 'Judecătoria CĂLĂRAŞI',
+  },
+  {
+    id: 73,
+    name: 'Judecătoria LEHLIU-GARA',
+  },
+  {
+    id: 74,
+    name: 'Judecătoria OLTENIŢA',
+  },
+  {
+    id: 75,
+    name: 'Tribunalul CARAŞ SEVERIN',
+  },
+  {
+    id: 76,
+    name: 'Judecătoria CARANSEBEŞ',
+  },
+  {
+    id: 77,
+    name: 'Judecătoria MOLDOVA-NOUĂ',
+  },
+  {
+    id: 78,
+    name: 'Judecătoria ORAVIŢA',
+  },
+  {
+    id: 79,
+    name: 'Judecătoria REŞITA',
+  },
+  {
+    id: 80,
+    name: 'Curtea de Apel CLUJ',
+  },
+  {
+    id: 81,
+    name: 'Tribunalul CLUJ',
+  },
+  {
+    id: 82,
+    name: 'Tribunalul Militar CLUJ-NAPOCA',
+  },
+  {
+    id: 83,
+    name: 'Tribunalul Specializat CLUJ',
+  },
+  {
+    id: 84,
+    name: 'Judecătoria CLUJ-NAPOCA',
+  },
+  {
+    id: 85,
+    name: 'Judecătoria DEJ',
+  },
+  {
+    id: 86,
+    name: 'Judecătoria GHERLA',
+  },
+  {
+    id: 87,
+    name: 'Judecătoria HUEDIN',
+  },
+  {
+    id: 88,
+    name: 'Judecătoria TURDA',
+  },
+  {
+    id: 89,
+    name: 'Curtea de Apel CONSTANŢA',
+  },
+  {
+    id: 90,
+    name: 'Tribunalul CONSTANŢA',
+  },
+  {
+    id: 91,
+    name: 'Judecătoria CONSTANŢA',
+  },
+  {
+    id: 92,
+    name: 'Judecătoria MANGALIA',
+  },
+  {
+    id: 93,
+    name: 'Judecătoria MEDGIDIA',
+  },
+  {
+    id: 94,
+    name: 'Judecătoria HÂRŞOVA',
+  },
+  {
+    id: 95,
+    name: 'Tribunalul COVASNA',
+  },
+  {
+    id: 96,
+    name: 'Judecătoria ÎNTORSURA BUZĂULUI',
+  },
+  {
+    id: 97,
+    name: 'Judecătoria SFÂNTU GHEORGHE',
+  },
+  {
+    id: 98,
+    name: 'Judecătoria TÂRGU SECUIESC',
+  },
+  {
+    id: 99,
+    name: 'Tribunalul DÂMBOVIŢA',
+  },
+  {
+    id: 100,
+    name: 'Judecătoria GĂEŞTI',
+  },
+  {
+    id: 101,
+    name: 'Judecătoria MORENI',
+  },
+  {
+    id: 102,
+    name: 'Judecătoria PUCIOASA',
+  },
+  {
+    id: 103,
+    name: 'Judecătoria RĂCARI',
+  },
+  {
+    id: 104,
+    name: 'Judecătoria TÂRGOVIŞTE',
+  },
+  {
+    id: 105,
+    name: 'Curtea de Apel CRAIOVA',
+  },
+  {
+    id: 106,
+    name: 'Tribunalul DOLJ',
+  },
+  {
+    id: 107,
+    name: 'Judecătoria BĂILEŞTI',
+  },
+  {
+    id: 108,
+    name: 'Judecătoria CALAFAT',
+  },
+  {
+    id: 109,
+    name: 'Judecătoria CRAIOVA',
+  },
+  {
+    id: 110,
+    name: 'Judecătoria FILIAŞI',
+  },
+  {
+    id: 111,
+    name: 'Judecătoria SEGARCEA',
+  },
+  {
+    id: 112,
+    name: 'Curtea de Apel GALAŢI',
+  },
+  {
+    id: 113,
+    name: 'Tribunalul GALAŢI',
+  },
+  {
+    id: 114,
+    name: 'Judecătoria GALAŢI',
+  },
+  {
+    id: 115,
+    name: 'Judecătoria TÂRGU BUJOR',
+  },
+  {
+    id: 116,
+    name: 'Judecătoria TECUCI',
+  },
+  {
+    id: 117,
+    name: 'Judecătoria LIEŞTI',
+  },
+  {
+    id: 118,
+    name: 'Tribunalul GIURGIU',
+  },
+  {
+    id: 119,
+    name: 'Judecătoria BOLINTIN VALE',
+  },
+  {
+    id: 120,
+    name: 'Judecătoria GIURGIU',
+  },
+  {
+    id: 121,
+    name: 'Tribunalul GORJ',
+  },
+  {
+    id: 122,
+    name: 'Judecătoria MOTRU',
+  },
+  {
+    id: 123,
+    name: 'Judecătoria NOVACI',
+  },
+  {
+    id: 124,
+    name: 'Judecătoria TÂRGU-CĂRBUNEŞTI',
+  },
+  {
+    id: 125,
+    name: 'Judecătoria TÂRGU JIU',
+  },
+  {
+    id: 126,
+    name: 'Tribunalul HARGHITA',
+  },
+  {
+    id: 127,
+    name: 'Judecătoria GHEORGHENI',
+  },
+  {
+    id: 128,
+    name: 'Judecătoria MIERCUREA CIUC',
+  },
+  {
+    id: 129,
+    name: 'Judecătoria ODORHEIUL SECUIESC',
+  },
+  {
+    id: 130,
+    name: 'Judecătoria TOPLIŢA',
+  },
+  {
+    id: 131,
+    name: 'Tribunalul HUNEDOARA',
+  },
+  {
+    id: 132,
+    name: 'Judecătoria BRAD',
+  },
+  {
+    id: 133,
+    name: 'Judecătoria DEVA',
+  },
+  {
+    id: 134,
+    name: 'Judecătoria HAŢEG',
+  },
+  {
+    id: 135,
+    name: 'Judecătoria HUNEDOARA',
+  },
+  {
+    id: 136,
+    name: 'Judecătoria ORAŞTIE',
+  },
+  {
+    id: 137,
+    name: 'Judecătoria PETROŞANI',
+  },
+  {
+    id: 138,
+    name: 'Tribunalul IALOMIŢA',
+  },
+  {
+    id: 139,
+    name: 'Judecătoria FETEŞTI',
+  },
+  {
+    id: 140,
+    name: 'Judecătoria SLOBOZIA',
+  },
+  {
+    id: 141,
+    name: 'Judecătoria URZICENI',
+  },
+  {
+    id: 142,
+    name: 'Curtea de Apel IAŞI',
+  },
+  {
+    id: 143,
+    name: 'Tribunalul IAŞI',
+  },
+  {
+    id: 144,
+    name: 'Tribunalul Militar IAŞI',
+  },
+  {
+    id: 145,
+    name: 'Judecătoria PAŞCANI',
+  },
+  {
+    id: 146,
+    name: 'Judecătoria HÂRLĂU',
+  },
+  {
+    id: 147,
+    name: 'Judecătoria IAŞI',
+  },
+  {
+    id: 148,
+    name: 'Judecătoria RĂDUCĂNENI',
+  },
+  {
+    id: 149,
+    name: 'Tribunalul ILFOV',
+  },
+  {
+    id: 150,
+    name: 'Judecătoria BUFTEA',
+  },
+  {
+    id: 151,
+    name: 'Judecătoria CORNETU',
+  },
+  {
+    id: 152,
+    name: 'Tribunalul MARAMUREŞ',
+  },
+  {
+    id: 153,
+    name: 'Judecătoria BAIA MARE',
+  },
+  {
+    id: 154,
+    name: 'Judecătoria DRAGOMIREŞTI',
+  },
+  {
+    id: 155,
+    name: 'Judecătoria SIGHETU MARMAŢIEI',
+  },
+  {
+    id: 156,
+    name: 'Judecătoria TÂRGU LAPUŞ',
+  },
+  {
+    id: 157,
+    name: 'Judecătoria VIŞEU DE SUS',
+  },
+  {
+    id: 158,
+    name: 'Tribunalul MEHEDINŢI',
+  },
+  {
+    id: 159,
+    name: 'Judecătoria BAIA DE ARAMĂ',
+  },
+  {
+    id: 160,
+    name: 'Judecătoria DROBETA-TURNU SEVERIN',
+  },
+  {
+    id: 161,
+    name: 'Judecătoria ORŞOVA',
+  },
+  {
+    id: 162,
+    name: 'Judecătoria STREHAIA',
+  },
+  {
+    id: 163,
+    name: 'Judecătoria VÂNJU MARE',
+  },
+  {
+    id: 164,
+    name: 'Curtea de Apel TÂRGU MUREŞ',
+  },
+  {
+    id: 165,
+    name: 'Tribunalul MUREŞ',
+  },
+  {
+    id: 166,
+    name: 'Tribunalul Specializat MUREŞ',
+  },
+  {
+    id: 167,
+    name: 'Judecătoria LUDUŞ',
+  },
+  {
+    id: 168,
+    name: 'Judecătoria REGHIN',
+  },
+  {
+    id: 169,
+    name: 'Judecătoria SIGHIŞOARA',
+  },
+  {
+    id: 170,
+    name: 'Judecătoria TÂRGU MUREŞ',
+  },
+  {
+    id: 171,
+    name: 'Judecătoria TÂRNAVENI',
+  },
+  {
+    id: 172,
+    name: 'Tribunalul NEAMŢ',
+  },
+  {
+    id: 173,
+    name: 'Judecătoria BICAZ',
+  },
+  {
+    id: 174,
+    name: 'Judecătoria PIATRA-NEAMT',
+  },
+  {
+    id: 175,
+    name: 'Judecătoria ROMAN',
+  },
+  {
+    id: 176,
+    name: 'Judecătoria TÂRGU NEAMŢ',
+  },
+  {
+    id: 177,
+    name: 'Tribunalul OLT',
+  },
+  {
+    id: 178,
+    name: 'Judecătoria BALŞ',
+  },
+  {
+    id: 179,
+    name: 'Judecătoria CARACAL',
+  },
+  {
+    id: 180,
+    name: 'Judecătoria CORABIA',
+  },
+  {
+    id: 181,
+    name: 'Judecătoria SLATINA',
+  },
+  {
+    id: 182,
+    name: 'Curtea de Apel PLOIEŞTI',
+  },
+  {
+    id: 183,
+    name: 'Tribunalul PRAHOVA',
+  },
+  {
+    id: 184,
+    name: 'Judecătoria CÂMPINA',
+  },
+  {
+    id: 185,
+    name: 'Judecătoria MIZIL',
+  },
+  {
+    id: 186,
+    name: 'Judecătoria PLOIEŞTI',
+  },
+  {
+    id: 187,
+    name: 'Judecătoria SINAIA',
+  },
+  {
+    id: 188,
+    name: 'Judecătoria VĂLENII DE MUNTE',
+  },
+  {
+    id: 189,
+    name: 'Tribunalul SĂLAJ',
+  },
+  {
+    id: 190,
+    name: 'Judecătoria ŞIMLEUL SILVANIEI',
+  },
+  {
+    id: 191,
+    name: 'Judecătoria ZALĂU',
+  },
+  {
+    id: 192,
+    name: 'Judecătoria JIBOU',
+  },
+  {
+    id: 193,
+    name: 'Tribunalul SATU MARE',
+  },
+  {
+    id: 194,
+    name: 'Judecătoria CAREI',
+  },
+  {
+    id: 195,
+    name: 'Judecătoria NEGREŞTI-OAŞ',
+  },
+  {
+    id: 196,
+    name: 'Judecătoria SATU MARE',
+  },
+  {
+    id: 197,
+    name: 'Tribunalul SIBIU',
+  },
+  {
+    id: 198,
+    name: 'Judecătoria AGNITA',
+  },
+  {
+    id: 199,
+    name: 'Judecătoria MEDIAŞ',
+  },
+  {
+    id: 200,
+    name: 'Judecătoria SALIŞTE',
+  },
+  {
+    id: 201,
+    name: 'Judecătoria SIBIU',
+  },
+  {
+    id: 202,
+    name: 'Judecătoria AVRIG',
+  },
+  {
+    id: 203,
+    name: 'Curtea de Apel SUCEAVA',
+  },
+  {
+    id: 204,
+    name: 'Tribunalul SUCEAVA',
+  },
+  {
+    id: 205,
+    name: 'Judecătoria CÂMPULUNG MOLDOVENESC',
+  },
+  {
+    id: 206,
+    name: 'Judecătoria FĂLTICENI',
+  },
+  {
+    id: 207,
+    name: 'Judecătoria GURA HUMORULUI',
+  },
+  {
+    id: 208,
+    name: 'Judecătoria RĂDĂUŢI',
+  },
+  {
+    id: 209,
+    name: 'Judecătoria SUCEAVA',
+  },
+  {
+    id: 210,
+    name: 'Judecătoria VATRA DORNEI',
+  },
+  {
+    id: 211,
+    name: 'Tribunalul TELEORMAN',
+  },
+  {
+    id: 212,
+    name: 'Judecătoria ROŞIORI DE VEDE',
+  },
+  {
+    id: 213,
+    name: 'Judecătoria TURNU MĂGURELE',
+  },
+  {
+    id: 214,
+    name: 'Judecătoria VIDELE',
+  },
+  {
+    id: 215,
+    name: 'Judecătoria ZIMNICEA',
+  },
+  {
+    id: 216,
+    name: 'Judecătoria ALEXANDRIA',
+  },
+  {
+    id: 217,
+    name: 'Curtea de Apel TIMIŞOARA',
+  },
+  {
+    id: 218,
+    name: 'Tribunalul Militar TIMIŞOARA',
+  },
+  {
+    id: 219,
+    name: 'Tribunalul TIMIŞ',
+  },
+  {
+    id: 220,
+    name: 'Judecătoria FĂGET',
+  },
+  {
+    id: 221,
+    name: 'Judecătoria DETA',
+  },
+  {
+    id: 222,
+    name: 'Judecătoria LUGOJ',
+  },
+  {
+    id: 223,
+    name: 'Judecătoria SÂNNICOLAUL MARE',
+  },
+  {
+    id: 224,
+    name: 'Judecătoria TIMIŞOARA',
+  },
+  {
+    id: 225,
+    name: 'Tribunalul TULCEA',
+  },
+  {
+    id: 226,
+    name: 'Judecătoria BABADAG',
+  },
+  {
+    id: 227,
+    name: 'Judecătoria MACIN',
+  },
+  {
+    id: 228,
+    name: 'Judecătoria TULCEA',
+  },
+  {
+    id: 229,
+    name: 'Tribunalul VÂLCEA',
+  },
+  {
+    id: 230,
+    name: 'Judecătoria BĂLCEŞTI',
+  },
+  {
+    id: 231,
+    name: 'Judecătoria BREZOI',
+  },
+  {
+    id: 232,
+    name: 'Judecătoria DRĂGĂŞANI',
+  },
+  {
+    id: 233,
+    name: 'Judecătoria HOREZU',
+  },
+  {
+    id: 234,
+    name: 'Judecătoria RÂMNICU VALCEA',
+  },
+  {
+    id: 235,
+    name: 'Tribunalul VASLUI',
+  },
+  {
+    id: 236,
+    name: 'Judecătoria BÂRLAD',
+  },
+  {
+    id: 237,
+    name: 'Judecătoria HUŞI',
+  },
+  {
+    id: 238,
+    name: 'Judecătoria VASLUI',
+  },
+  {
+    id: 239,
+    name: 'Tribunalul VRANCEA',
+  },
+  {
+    id: 240,
+    name: 'Judecătoria ADJUD',
+  },
+  {
+    id: 241,
+    name: 'Judecătoria FOCŞANI',
+  },
+  {
+    id: 242,
+    name: 'Judecătoria PANCIU',
+  },
+];
diff --git a/backend/src/migrations/seed/sectors.seed.ts b/backend/src/migrations/seed/sectors.seed.ts
new file mode 100644
index 000000000..242488802
--- /dev/null
+++ b/backend/src/migrations/seed/sectors.seed.ts
@@ -0,0 +1,32 @@
+export const SECTORS = [
+  {
+    id: 13930,
+    countyId: 11,
+    name: 'Sector 1',
+  },
+  {
+    id: 13931,
+    countyId: 11,
+    name: 'Sector 2',
+  },
+  {
+    id: 13932,
+    countyId: 11,
+    name: 'Sector 3',
+  },
+  {
+    id: 13933,
+    countyId: 11,
+    name: 'Sector 4',
+  },
+  {
+    id: 13934,
+    countyId: 11,
+    name: 'Sector 5',
+  },
+  {
+    id: 13935,
+    countyId: 11,
+    name: 'Sector 6',
+  },
+];
diff --git a/backend/src/modules/application/services/application.service.ts b/backend/src/modules/application/services/application.service.ts
index b91ca1a02..901e8637f 100644
--- a/backend/src/modules/application/services/application.service.ts
+++ b/backend/src/modules/application/services/application.service.ts
@@ -62,7 +62,6 @@ export class ApplicationService {
           `${APPLICATIONS_FILES_DIR}`,
           logo,
           FILE_TYPE.IMAGE,
-          createApplicationDto.name,
         );
 
         createApplicationDto = {
@@ -339,7 +338,6 @@ export class ApplicationService {
           `${APPLICATIONS_FILES_DIR}`,
           logo,
           FILE_TYPE.IMAGE,
-          application.name,
         );
 
         applicationPayload = {
diff --git a/backend/src/modules/organization/constants/errors.constants.ts b/backend/src/modules/organization/constants/errors.constants.ts
index 47868e21f..1702cb3c1 100644
--- a/backend/src/modules/organization/constants/errors.constants.ts
+++ b/backend/src/modules/organization/constants/errors.constants.ts
@@ -43,6 +43,15 @@ export const ORGANIZATION_ERRORS = {
     message: 'Error while uploading the files',
     errorCode: 'ORG_010',
   },
+  UPLOAD_NON_POLITICAL_AFFILIATION: {
+    message: 'Error while uploading the non political affiliation file',
+    errorCode: 'ORG_030',
+  },
+
+  UPLOAD_BALANCE_SHEET: {
+    message: 'Error while uploading the balance sheet file',
+    errorCode: 'ORG_031',
+  },
   GET_REPORT: {
     message: 'Report not found',
     errorCode: 'ORG_011',
@@ -68,6 +77,15 @@ export const ORGANIZATION_ERRORS = {
       message: 'Error while deleting the organization statute',
       errorCode: 'ORG_027',
     },
+    NON_POLITICAL_AFFILIATION: {
+      message:
+        'Error while deleting the organization non political affiliation file',
+      errorCode: 'ORG_027',
+    },
+    BALANCE_SHEET: {
+      message: 'Error while deleting the organization balance sheet file',
+      errorCode: 'ORG_027',
+    },
   },
   ALREADY_RESTRICTED: {
     message: 'Organization is already RESTRICTED',
@@ -157,9 +175,17 @@ export const ORGANIZATION_REQUEST_ERRORS = {
       message: 'An organization with this cui already exists',
       errorCode: 'REQ_007',
     },
-    RAF_NUMBER_EXISTS: {
-      message: 'An organization with this rafNumber already exists',
-      errorCode: 'REQ_008',
+
+    ASSOCIATION_REGISTRY_NUMBER_EXISTS: {
+      message:
+        'An organization with this asscotiation registry number already exists',
+      errorCode: 'REQ_013',
+    },
+
+    NATIONAL_REGISTRY_NUMBER_EXISTS: {
+      message:
+        'An organization with this national registry number already exists',
+      errorCode: 'REQ_014',
     },
     ORGANIZATION_NAME_EXISTS: {
       message: 'An organization with this name already exists',
diff --git a/backend/src/modules/organization/constants/files.constants.ts b/backend/src/modules/organization/constants/files.constants.ts
index f6bd56f46..92d6e1982 100644
--- a/backend/src/modules/organization/constants/files.constants.ts
+++ b/backend/src/modules/organization/constants/files.constants.ts
@@ -1,6 +1,8 @@
 export const ORGANIZATION_FILES_DIR = {
   LOGO: 'logo',
   STATUTE: 'statute',
+  NON_POLITICAL_AFFILITION: 'non_political_affiliation',
+  BALANCE_SHEET: 'balance_sheet',
   REPORTS: 'reports',
   PARTNERS: 'partners',
   INVESTORS: 'investors',
diff --git a/backend/src/modules/organization/controllers/organization-profile.controller.ts b/backend/src/modules/organization/controllers/organization-profile.controller.ts
index 6b66635b7..b279368c5 100644
--- a/backend/src/modules/organization/controllers/organization-profile.controller.ts
+++ b/backend/src/modules/organization/controllers/organization-profile.controller.ts
@@ -55,6 +55,8 @@ export class OrganizationProfileController {
     FileFieldsInterceptor([
       { name: 'logo', maxCount: 1 },
       { name: 'organizationStatute', maxCount: 1 },
+      { name: 'nonPoliticalAffiliationFile', maxCount: 1 },
+      { name: 'balanceSheetFile', maxCount: 1 },
     ]),
   )
   @Patch()
@@ -65,9 +67,13 @@ export class OrganizationProfileController {
     {
       logo,
       organizationStatute,
+      nonPoliticalAffiliationFile,
+      balanceSheetFile,
     }: {
       logo: Express.Multer.File[];
       organizationStatute: Express.Multer.File[];
+      nonPoliticalAffiliationFile: Express.Multer.File[];
+      balanceSheetFile: Express.Multer.File[];
     },
   ) {
     return this.organizationService.update(
@@ -75,6 +81,8 @@ export class OrganizationProfileController {
       updateOrganizationDto,
       logo,
       organizationStatute,
+      nonPoliticalAffiliationFile,
+      balanceSheetFile,
     );
   }
 
diff --git a/backend/src/modules/organization/controllers/organization.controller.ts b/backend/src/modules/organization/controllers/organization.controller.ts
index 7e5224686..eea984489 100644
--- a/backend/src/modules/organization/controllers/organization.controller.ts
+++ b/backend/src/modules/organization/controllers/organization.controller.ts
@@ -212,6 +212,8 @@ export class OrganizationController {
     FileFieldsInterceptor([
       { name: 'logo', maxCount: 1 },
       { name: 'organizationStatute', maxCount: 1 },
+      { name: 'nonPoliticalAffiliationFile', maxCount: 1 },
+      { name: 'balanceSheetFile', maxCount: 1 },
     ]),
   )
   @Patch(':id')
@@ -222,9 +224,13 @@ export class OrganizationController {
     {
       logo,
       organizationStatute,
+      nonPoliticalAffiliationFile,
+      balanceSheetFile,
     }: {
       logo: Express.Multer.File[];
       organizationStatute: Express.Multer.File[];
+      nonPoliticalAffiliationFile: Express.Multer.File[];
+      balanceSheetFile: Express.Multer.File[];
     },
   ) {
     return this.organizationService.update(
@@ -232,6 +238,8 @@ export class OrganizationController {
       updateOrganizationDto,
       logo,
       organizationStatute,
+      nonPoliticalAffiliationFile,
+      balanceSheetFile,
     );
   }
 
@@ -321,6 +329,29 @@ export class OrganizationController {
     );
   }
 
+  @Roles(Role.SUPER_ADMIN, Role.ADMIN)
+  @ApiParam({ name: 'id', type: String })
+  @Delete(':id/non-political-affiliation')
+  deleteNonPoliticalAffiliation(
+    @ExtractUser() user: User,
+    @Param('id') id: number,
+  ) {
+    // for admin user.organizationId has precedence
+    return this.organizationService.deleteNonPoliticalAffiliation(
+      user?.organizationId || id,
+    );
+  }
+
+  @Roles(Role.SUPER_ADMIN, Role.ADMIN)
+  @ApiParam({ name: 'id', type: String })
+  @Delete(':id/balance-sheet')
+  deleteBalanceSheet(@ExtractUser() user: User, @Param('id') id: number) {
+    // for admin user.organizationId has precedence
+    return this.organizationService.deleteBalanceSheet(
+      user?.organizationId || id,
+    );
+  }
+
   @Roles(Role.SUPER_ADMIN)
   @ApiParam({ name: 'id', type: String })
   @ApiBody({
diff --git a/backend/src/modules/organization/dto/create-contact.dto.ts b/backend/src/modules/organization/dto/create-contact.dto.ts
index 1655ce7db..56672924f 100644
--- a/backend/src/modules/organization/dto/create-contact.dto.ts
+++ b/backend/src/modules/organization/dto/create-contact.dto.ts
@@ -28,4 +28,9 @@ export class CreateContactDto {
   @IsNotEmpty()
   @MaxLength(50)
   email: string;
+
+  @IsOptional()
+  @IsString()
+  @MaxLength(50)
+  role: string;
 }
diff --git a/backend/src/modules/organization/dto/create-organization-general.dto.ts b/backend/src/modules/organization/dto/create-organization-general.dto.ts
index 0089ac6b8..ae33713e0 100644
--- a/backend/src/modules/organization/dto/create-organization-general.dto.ts
+++ b/backend/src/modules/organization/dto/create-organization-general.dto.ts
@@ -75,6 +75,30 @@ export class CreateOrganizationGeneralDto {
   @Trim()
   cui: string;
 
+  @IsString()
+  @MaxLength(30)
+  @Trim()
+  associationRegistryNumber: string;
+
+  @IsString()
+  @MaxLength(10)
+  @Trim()
+  associationRegistryPart: string;
+
+  @IsString()
+  @MaxLength(10)
+  @Trim()
+  associationRegistrySection: string;
+
+  @IsNumber()
+  @ToNumber()
+  associationRegistryIssuerId: number;
+
+  @IsString()
+  @MaxLength(30)
+  @Trim()
+  nationalRegistryNumber: string;
+
   /* 
   Organization Register of Associations and Foundations Number 
   @example 1249/A/2020
diff --git a/backend/src/modules/organization/dto/update-organization-legal.dto.ts b/backend/src/modules/organization/dto/update-organization-legal.dto.ts
index a4165b469..c150d2da3 100644
--- a/backend/src/modules/organization/dto/update-organization-legal.dto.ts
+++ b/backend/src/modules/organization/dto/update-organization-legal.dto.ts
@@ -28,4 +28,12 @@ export class UpdateOrganizationLegalDto {
   @IsOptional()
   @IsString()
   organizationStatute?: string;
+
+  @IsOptional()
+  @IsString()
+  nonPoliticalAffiliationFile?: string;
+
+  @IsOptional()
+  @IsString()
+  balanceSheetFile?: string;
 }
diff --git a/backend/src/modules/organization/entities/contact.entity.ts b/backend/src/modules/organization/entities/contact.entity.ts
index 895b547ed..f1863fa7e 100644
--- a/backend/src/modules/organization/entities/contact.entity.ts
+++ b/backend/src/modules/organization/entities/contact.entity.ts
@@ -13,6 +13,9 @@ export class Contact extends BaseEntity {
   @Column({ type: 'text', name: 'phone', nullable: true })
   phone: string;
 
+  @Column({ type: 'text', name: 'role', nullable: true })
+  role: string;
+
   @ManyToMany(
     (type) => OrganizationLegal,
     (organizationLegal) => organizationLegal.directors,
diff --git a/backend/src/modules/organization/entities/organization-general.entity.ts b/backend/src/modules/organization/entities/organization-general.entity.ts
index 38add69db..3133b1614 100644
--- a/backend/src/modules/organization/entities/organization-general.entity.ts
+++ b/backend/src/modules/organization/entities/organization-general.entity.ts
@@ -6,6 +6,7 @@ import { Column, Entity, JoinColumn, ManyToOne, OneToOne } from 'typeorm';
 import { ContactPerson } from '../interfaces/contact-person.interface';
 import { OrganizationType } from '../enums/organization-type.enum';
 import { Organization } from './organization.entity';
+import { Issuer } from 'src/shared/entities';
 
 @Entity()
 export class OrganizationGeneral extends BaseEntity {
@@ -30,7 +31,34 @@ export class OrganizationGeneral extends BaseEntity {
   @Column({ type: 'text', name: 'cui', unique: true })
   cui: string;
 
-  @Column({ type: 'text', name: 'raf_number', unique: true })
+  @Column({ type: 'text', name: 'association_registry_number', nullable: true })
+  associationRegistryNumber: string;
+
+  @Column({ type: 'text', name: 'association_registry_part', nullable: true })
+  associationRegistryPart: string;
+
+  @Column({
+    type: 'text',
+    name: 'association_registry_section',
+    nullable: true,
+  })
+  associationRegistrySection: string;
+
+  @Column({
+    type: 'integer',
+    name: 'association_registry_issuer_id',
+    nullable: true,
+  })
+  associationRegistryIssuerId: number;
+
+  @ManyToOne((type) => Issuer)
+  @JoinColumn({ name: 'association_registry_issuer_id' })
+  associationRegistryIssuer: Issuer;
+
+  @Column({ type: 'text', name: 'national_registry_number', nullable: true })
+  nationalRegistryNumber: string;
+
+  @Column({ type: 'text', name: 'raf_number', unique: true, nullable: true })
   rafNumber: string;
 
   @Column({ type: 'text', name: 'short_description', nullable: true })
diff --git a/backend/src/modules/organization/entities/organization-legal.entity.ts b/backend/src/modules/organization/entities/organization-legal.entity.ts
index 821bfef82..1c286569f 100644
--- a/backend/src/modules/organization/entities/organization-legal.entity.ts
+++ b/backend/src/modules/organization/entities/organization-legal.entity.ts
@@ -45,4 +45,18 @@ export class OrganizationLegal extends BaseEntity {
 
   @Column({ type: 'varchar', name: 'organization_statute', nullable: true })
   organizationStatute: string;
+
+  @Column({
+    type: 'varchar',
+    name: 'non_political_affiliation_file',
+    nullable: true,
+  })
+  nonPoliticalAffiliationFile: string;
+
+  @Column({
+    type: 'varchar',
+    name: 'balance_sheet_file',
+    nullable: true,
+  })
+  balanceSheetFile: string;
 }
diff --git a/backend/src/modules/organization/services/organization-general.service.ts b/backend/src/modules/organization/services/organization-general.service.ts
index bab548e74..a66ed0705 100644
--- a/backend/src/modules/organization/services/organization-general.service.ts
+++ b/backend/src/modules/organization/services/organization-general.service.ts
@@ -90,7 +90,13 @@ export class OrganizationGeneralService {
 
       let organizationGeneral = await this.organizationGeneralRepository.get({
         where: { id: organization.organizationGeneralId },
-        relations: ['city', 'county', 'organizationCounty', 'organizationCity'],
+        relations: [
+          'city',
+          'county',
+          'organizationCounty',
+          'organizationCity',
+          'associationRegistryIssuer',
+        ],
       });
 
       // Effect 1: Update financial data if CUI has changed
@@ -150,6 +156,14 @@ export class OrganizationGeneralService {
         { id: Not(orgGeneralId), alias: newDTO?.alias },
         { id: Not(orgGeneralId), email: newDTO?.email },
         { id: Not(orgGeneralId), phone: newDTO?.phone },
+        {
+          id: Not(orgGeneralId),
+          nationalRegistryNumber: newDTO?.nationalRegistryNumber,
+        },
+        {
+          id: Not(orgGeneralId),
+          associationRegistryNumber: newDTO?.associationRegistryNumber,
+        },
       ],
     });
     for (let i = 0; i < existing.length; i++) {
@@ -173,6 +187,21 @@ export class OrganizationGeneralService {
           ORGANIZATION_REQUEST_ERRORS.CREATE.ORGANIZATION_PHONE_EXISTS,
         );
       }
+      if (
+        existing[i].nationalRegistryNumber === newDTO?.nationalRegistryNumber
+      ) {
+        errors.push(
+          ORGANIZATION_REQUEST_ERRORS.CREATE.NATIONAL_REGISTRY_NUMBER_EXISTS,
+        );
+      }
+      if (
+        existing[i].associationRegistryNumber ===
+        newDTO?.associationRegistryNumber
+      ) {
+        errors.push(
+          ORGANIZATION_REQUEST_ERRORS.CREATE.ASSOCIATION_REGISTRY_NUMBER_EXISTS,
+        );
+      }
     }
 
     if (errors.length) {
diff --git a/backend/src/modules/organization/services/organization-legal.service.ts b/backend/src/modules/organization/services/organization-legal.service.ts
index 525175d46..9d0817d0d 100644
--- a/backend/src/modules/organization/services/organization-legal.service.ts
+++ b/backend/src/modules/organization/services/organization-legal.service.ts
@@ -13,6 +13,8 @@ import { ORGANIZATION_ERRORS } from '../constants/errors.constants';
 import { UpdateOrganizationLegalDto } from '../dto/update-organization-legal.dto';
 import { OrganizationLegalRepository } from '../repositories';
 import { ContactService } from './contact.service';
+import { ORGANIZATION_FILES_DIR } from '../constants/files.constants';
+import * as Sentry from '@sentry/node';
 
 @Injectable()
 export class OrganizationLegalService {
@@ -26,8 +28,9 @@ export class OrganizationLegalService {
   public async update(
     id: number,
     updateOrganizationLegalDto: UpdateOrganizationLegalDto,
-    organizationStatutePath?: string,
     organizationStatute?: Express.Multer.File[],
+    nonPoliticalAffiliationFile?: Express.Multer.File[],
+    balanceSheetFile?: Express.Multer.File[],
   ) {
     const orgLegal = await this.organizationLegalRepostory.get({
       where: { id },
@@ -62,7 +65,7 @@ export class OrganizationLegalService {
 
       try {
         const uploadedFile = await this.fileManagerService.uploadFiles(
-          organizationStatutePath,
+          `${id}/${ORGANIZATION_FILES_DIR.STATUTE}`,
           organizationStatute,
           FILE_TYPE.FILE,
         );
@@ -76,6 +79,7 @@ export class OrganizationLegalService {
           error: { error },
           ...ORGANIZATION_ERRORS.UPLOAD,
         });
+        Sentry.captureException(error);
         if (error instanceof HttpException) {
           throw error;
         } else {
@@ -87,10 +91,79 @@ export class OrganizationLegalService {
       }
     }
 
+    // Non Political Affiliation File
+    if (nonPoliticalAffiliationFile) {
+      if (orgLegal.nonPoliticalAffiliationFile) {
+        await this.fileManagerService.deleteFiles([
+          orgLegal.nonPoliticalAffiliationFile,
+        ]);
+      }
+
+      try {
+        const uploadedFile = await this.fileManagerService.uploadFiles(
+          `${id}/${ORGANIZATION_FILES_DIR.NON_POLITICAL_AFFILITION}`,
+          nonPoliticalAffiliationFile,
+          FILE_TYPE.FILE,
+        );
+
+        organizationLegalData = {
+          ...organizationLegalData,
+          nonPoliticalAffiliationFile: uploadedFile[0],
+        };
+      } catch (error) {
+        this.logger.error({
+          error: { error },
+          ...ORGANIZATION_ERRORS.UPLOAD_NON_POLITICAL_AFFILIATION,
+        });
+        Sentry.captureException(error);
+        if (error instanceof HttpException) {
+          throw error;
+        } else {
+          throw new InternalServerErrorException({
+            ...ORGANIZATION_ERRORS.UPLOAD_NON_POLITICAL_AFFILIATION,
+            error,
+          });
+        }
+      }
+    }
+
+    // Balance Sheet File
+    if (balanceSheetFile) {
+      if (orgLegal.balanceSheetFile) {
+        await this.fileManagerService.deleteFiles([orgLegal.balanceSheetFile]);
+      }
+
+      try {
+        const uploadedFile = await this.fileManagerService.uploadFiles(
+          `${id}/${ORGANIZATION_FILES_DIR.BALANCE_SHEET}`,
+          balanceSheetFile,
+          FILE_TYPE.FILE,
+        );
+
+        organizationLegalData = {
+          ...organizationLegalData,
+          balanceSheetFile: uploadedFile[0],
+        };
+      } catch (error) {
+        this.logger.error({
+          error: { error },
+          ...ORGANIZATION_ERRORS.UPLOAD_BALANCE_SHEET,
+        });
+        Sentry.captureException(error);
+        if (error instanceof HttpException) {
+          throw error;
+        } else {
+          throw new InternalServerErrorException({
+            ...ORGANIZATION_ERRORS.UPLOAD_BALANCE_SHEET,
+            error,
+          });
+        }
+      }
+    }
+
     await this.organizationLegalRepostory.save({
       id,
       ...organizationLegalData,
-      others: organizationLegalData?.others || null,
     });
 
     let organizationLegal = await this.organizationLegalRepostory.get({
@@ -109,6 +182,28 @@ export class OrganizationLegalService {
       };
     }
 
+    if (organizationLegal.nonPoliticalAffiliationFile) {
+      const nonPoliticalAffiliationFilePublicUrl =
+        await this.fileManagerService.generatePresignedURL(
+          organizationLegal.nonPoliticalAffiliationFile,
+        );
+      organizationLegal = {
+        ...organizationLegal,
+        nonPoliticalAffiliationFile: nonPoliticalAffiliationFilePublicUrl,
+      };
+    }
+
+    if (organizationLegal.balanceSheetFile) {
+      const balanceSheetFile =
+        await this.fileManagerService.generatePresignedURL(
+          organizationLegal.balanceSheetFile,
+        );
+      organizationLegal = {
+        ...organizationLegal,
+        balanceSheetFile: balanceSheetFile,
+      };
+    }
+
     return organizationLegal;
   }
 
@@ -139,6 +234,7 @@ export class OrganizationLegalService {
         ...ORGANIZATION_ERRORS.DELETE.STATUTE,
       });
 
+      Sentry.captureException(error);
       const err = error?.response;
       throw new InternalServerErrorException({
         ...ORGANIZATION_ERRORS.DELETE.STATUTE,
@@ -146,4 +242,75 @@ export class OrganizationLegalService {
       });
     }
   }
+
+  public async deleteNonPoliticalAffiliation(
+    organizationLegalId: number,
+  ): Promise<void> {
+    try {
+      // 1. Query organization legal data
+      const organizationLegal = await this.organizationLegalRepostory.get({
+        where: { id: organizationLegalId },
+      });
+
+      if (organizationLegal?.nonPoliticalAffiliationFile) {
+        // 2. remove file from s3
+        await this.fileManagerService.deleteFiles([
+          organizationLegal.nonPoliticalAffiliationFile,
+        ]);
+
+        // 3. remove path from database
+        await this.organizationLegalRepostory.save({
+          ...organizationLegal,
+          nonPoliticalAffiliationFile: null,
+        });
+      }
+    } catch (error) {
+      this.logger.error({
+        error,
+        ...ORGANIZATION_ERRORS.DELETE.NON_POLITICAL_AFFILIATION,
+      });
+      Sentry.captureException(error);
+
+      const err = error?.response;
+      throw new InternalServerErrorException({
+        ...ORGANIZATION_ERRORS.DELETE.NON_POLITICAL_AFFILIATION,
+        error: err,
+      });
+    }
+  }
+
+  public async deleteBalanceSheetFile(
+    organizationLegalId: number,
+  ): Promise<void> {
+    try {
+      const organizationLegal = await this.organizationLegalRepostory.get({
+        where: { id: organizationLegalId },
+      });
+
+      if (organizationLegal?.balanceSheetFile) {
+        // 2. remove file from s3
+        await this.fileManagerService.deleteFiles([
+          organizationLegal.balanceSheetFile,
+        ]);
+
+        // 3. remove path from database
+        await this.organizationLegalRepostory.save({
+          ...organizationLegal,
+          balanceSheetFile: null,
+        });
+      }
+    } catch (error) {
+      this.logger.error({
+        error,
+        ...ORGANIZATION_ERRORS.DELETE.BALANCE_SHEET,
+      });
+
+      Sentry.captureException(error);
+      const err = error?.response;
+      throw new InternalServerErrorException({
+        ...ORGANIZATION_ERRORS.DELETE.BALANCE_SHEET,
+        error: err,
+      });
+    }
+  }
 }
diff --git a/backend/src/modules/organization/services/organization-report.service.ts b/backend/src/modules/organization/services/organization-report.service.ts
index 5e36a14fd..cd3d7bf93 100644
--- a/backend/src/modules/organization/services/organization-report.service.ts
+++ b/backend/src/modules/organization/services/organization-report.service.ts
@@ -107,7 +107,6 @@ export class OrganizationReportService {
         `${organizationId}/${ORGANIZATION_FILES_DIR.PARTNERS}`,
         files,
         FILE_TYPE.FILE,
-        `${partner.year}_${PARTNER_LIST}`,
       );
 
       await this.partnerRepository.save({
@@ -158,7 +157,6 @@ export class OrganizationReportService {
         `${organizationId}/${ORGANIZATION_FILES_DIR.INVESTORS}`,
         files,
         FILE_TYPE.FILE,
-        `${investor.year}_${INVESTOR_LIST}`,
       );
 
       await this.investorRepository.save({
diff --git a/backend/src/modules/organization/services/organization-request.service.ts b/backend/src/modules/organization/services/organization-request.service.ts
index dcf7b219d..f882233e8 100644
--- a/backend/src/modules/organization/services/organization-request.service.ts
+++ b/backend/src/modules/organization/services/organization-request.service.ts
@@ -73,6 +73,7 @@ export class OrganizationRequestService {
         'organization.organizationGeneral.county',
         'organization.organizationGeneral.organizationCity',
         'organization.organizationGeneral.organizationCounty',
+        'organization.organizationGeneral.associationRegistryIssuer',
         'organization.organizationActivity',
         'organization.organizationActivity.federations',
         'organization.organizationActivity.coalitions',
@@ -172,13 +173,21 @@ export class OrganizationRequestService {
     if (organization) {
       // 2.1 validate organization general
       if (organization.general) {
-        const { cui, rafNumber, name, email, phone, alias } =
-          organization.general;
+        const {
+          cui,
+          name,
+          email,
+          phone,
+          alias,
+          associationRegistryNumber,
+          nationalRegistryNumber,
+        } = organization.general;
 
         errors.push(
           ...(await this.organizationService.validateOrganizationGeneral(
             cui,
-            rafNumber,
+            associationRegistryNumber,
+            nationalRegistryNumber,
             name,
             email,
             phone,
@@ -340,9 +349,8 @@ export class OrganizationRequestService {
 
   public async sendRestrictRequest(organizationId: number): Promise<void> {
     try {
-      const organization = await this.organizationService.findWithUsers(
-        organizationId,
-      );
+      const organization =
+        await this.organizationService.findWithUsers(organizationId);
 
       this.eventEmitter.emit(
         EVENTS.DISABLE_ORGANIZATION_REQUEST,
diff --git a/backend/src/modules/organization/services/organization.service.ts b/backend/src/modules/organization/services/organization.service.ts
index 9b3b4e1ee..90d114729 100644
--- a/backend/src/modules/organization/services/organization.service.ts
+++ b/backend/src/modules/organization/services/organization.service.ts
@@ -325,14 +325,6 @@ export class OrganizationService {
       paginationOptions,
     );
 
-    for (let index in ongList.items) {
-      const data = await this.findWithRelations(ongList.items[index].id);
-      ongList.items[index] = {
-        ...ongList.items[index],
-        ...data,
-      };
-    }
-
     // Map the logo url
     const items =
       await this.fileManagerService.mapLogoToEntity<OrganizationView>(
@@ -415,7 +407,15 @@ export class OrganizationService {
       'organizationGeneral.phone': 'Organization Phone',
       'organizationGeneral.yearCreated': 'Year Created',
       'organizationGeneral.cui': 'CUI',
-      'organizationGeneral.rafNumber': 'RAF Number',
+      'organizationGeneral.associationRegistryNumber':
+        'Association Registry Number',
+      'organizationGeneral.associationRegistryPart':
+        'Association Registry Part',
+      'organizationGeneral.associationRegistrySection':
+        'Association Registry Section',
+      'organizationGeneral.associationRegistryIssuer':
+        'Association Registry Issuer',
+      'organizationGeneral.nationalRegistryNumber': 'National Registry Number',
       'organizationGeneral.shortDescription': 'Short Description',
       'organizationGeneral.description': 'Description',
       'organizationGeneral.address': 'Address',
@@ -560,6 +560,7 @@ export class OrganizationService {
         'organizationGeneral.county',
         'organizationGeneral.organizationCity',
         'organizationGeneral.organizationCounty',
+        'organizationGeneral.associationRegistryIssuer',
         'organizationActivity',
         'organizationActivity.federations',
         'organizationActivity.coalitions',
@@ -597,6 +598,8 @@ export class OrganizationService {
     }
 
     // Public: The URL can be replaced as above OR move all public in the "public" folder of each organization for better structure
+
+    // Statute
     if (organization.organizationLegal.organizationStatute) {
       const organizationStatute =
         await this.fileManagerService.generatePresignedURL(
@@ -605,6 +608,25 @@ export class OrganizationService {
       organization.organizationLegal.organizationStatute = organizationStatute;
     }
 
+    // Non Political Affiliation File
+    if (organization.organizationLegal.nonPoliticalAffiliationFile) {
+      const nonPoliticalAffiliationFile =
+        await this.fileManagerService.generatePresignedURL(
+          organization.organizationLegal.nonPoliticalAffiliationFile,
+        );
+      organization.organizationLegal.nonPoliticalAffiliationFile =
+        nonPoliticalAffiliationFile;
+    }
+
+    // Balance Sheet File
+    if (organization.organizationLegal.balanceSheetFile) {
+      const balanceSheetFile =
+        await this.fileManagerService.generatePresignedURL(
+          organization.organizationLegal.balanceSheetFile,
+        );
+      organization.organizationLegal.balanceSheetFile = balanceSheetFile;
+    }
+
     return organization;
   }
 
@@ -969,6 +991,8 @@ export class OrganizationService {
     updateOrganizationDto: UpdateOrganizationDto,
     logo?: Express.Multer.File[],
     organizationStatute?: Express.Multer.File[],
+    nonPoliticalAffiliationFile?: Express.Multer.File[],
+    balanceSheetFile?: Express.Multer.File[],
   ): Promise<any> {
     const organization = await this.find(id);
 
@@ -994,11 +1018,19 @@ export class OrganizationService {
         FILE_TYPE.FILE,
       );
 
+      this.fileManagerService.validateFiles(
+        nonPoliticalAffiliationFile,
+        FILE_TYPE.FILE,
+      );
+
+      this.fileManagerService.validateFiles(balanceSheetFile, FILE_TYPE.FILE);
+
       return this.organizationLegalService.update(
         organization.organizationLegalId,
         updateOrganizationDto.legal,
-        `${id}/${ORGANIZATION_FILES_DIR.STATUTE}`,
         organizationStatute,
+        nonPoliticalAffiliationFile,
+        balanceSheetFile,
       );
     }
 
@@ -1163,6 +1195,64 @@ export class OrganizationService {
     }
   }
 
+  public async deleteNonPoliticalAffiliation(
+    organizationId: number,
+  ): Promise<void> {
+    try {
+      const organization = await this.organizationRepository.get({
+        where: { id: organizationId },
+        relations: ['organizationLegal'],
+      });
+
+      await this.organizationLegalService.deleteNonPoliticalAffiliation(
+        organization.organizationLegalId,
+      );
+    } catch (error) {
+      this.logger.error({
+        error,
+        ...ORGANIZATION_ERRORS.DELETE.NON_POLITICAL_AFFILIATION,
+      });
+
+      if (error instanceof HttpException) {
+        throw error;
+      } else {
+        const err = error?.response;
+        throw new InternalServerErrorException({
+          ...ORGANIZATION_ERRORS.DELETE.NON_POLITICAL_AFFILIATION,
+          error: err,
+        });
+      }
+    }
+  }
+
+  public async deleteBalanceSheet(organizationId: number): Promise<void> {
+    try {
+      const organization = await this.organizationRepository.get({
+        where: { id: organizationId },
+        relations: ['organizationLegal'],
+      });
+
+      await this.organizationLegalService.deleteBalanceSheetFile(
+        organization.organizationLegalId,
+      );
+    } catch (error) {
+      this.logger.error({
+        error,
+        ...ORGANIZATION_ERRORS.DELETE.BALANCE_SHEET,
+      });
+
+      if (error instanceof HttpException) {
+        throw error;
+      } else {
+        const err = error?.response;
+        throw new InternalServerErrorException({
+          ...ORGANIZATION_ERRORS.DELETE.BALANCE_SHEET,
+          error: err,
+        });
+      }
+    }
+  }
+
   /**
    * Will update the status from PENDING to ACTIVE
    *
@@ -1300,7 +1390,8 @@ export class OrganizationService {
 
   public async validateOrganizationGeneral(
     cui: string,
-    rafNumber: string,
+    associationRegistryNumber: string,
+    nationalRegistryNumber: string,
     name: string,
     email: string,
     phone: string,
@@ -1329,15 +1420,28 @@ export class OrganizationService {
       );
     }
 
-    const organizationWithRafNumber =
+    const organizationWithAssociationRegistryNumber =
+      await this.organizationGeneralService.findOne({
+        where: { associationRegistryNumber },
+      });
+
+    if (organizationWithAssociationRegistryNumber) {
+      errors.push(
+        new BadRequestException(
+          ORGANIZATION_REQUEST_ERRORS.CREATE.ASSOCIATION_REGISTRY_NUMBER_EXISTS,
+        ),
+      );
+    }
+
+    const organizationWithNationalRegistryNumber =
       await this.organizationGeneralService.findOne({
-        where: { rafNumber },
+        where: { nationalRegistryNumber },
       });
 
-    if (organizationWithRafNumber) {
+    if (organizationWithNationalRegistryNumber) {
       errors.push(
         new BadRequestException(
-          ORGANIZATION_REQUEST_ERRORS.CREATE.RAF_NUMBER_EXISTS,
+          ORGANIZATION_REQUEST_ERRORS.CREATE.NATIONAL_REGISTRY_NUMBER_EXISTS,
         ),
       );
     }
diff --git a/backend/src/modules/user/constants/invites-filters.config.ts b/backend/src/modules/user/constants/invites-filters.config.ts
index cdbb46197..950f7199e 100644
--- a/backend/src/modules/user/constants/invites-filters.config.ts
+++ b/backend/src/modules/user/constants/invites-filters.config.ts
@@ -7,10 +7,21 @@ export const INVITE_FILTERS_CONFIG = {
     email: true,
     phone: true,
     createdOn: true,
+    role: true,
+    organization: {
+      id: true,
+      organizationGeneral: {
+        alias: true,
+      },
+    },
   },
   searchableColumns: ['name'],
   defaultSortBy: 'name',
   defaultOrderDirection: OrderDirection.ASC,
-  relations: {},
+  relations: {
+    organization: {
+      organizationGeneral: true,
+    },
+  },
   rangeColumn: 'createdOn',
 };
diff --git a/backend/src/modules/user/constants/user-filters.config.ts b/backend/src/modules/user/constants/user-filters.config.ts
index 356259cd8..f0d6400ae 100644
--- a/backend/src/modules/user/constants/user-filters.config.ts
+++ b/backend/src/modules/user/constants/user-filters.config.ts
@@ -1,6 +1,6 @@
 import { OrderDirection } from 'src/common/enums/order-direction.enum';
 
-export const USER_FILTERS_CONFIG = {
+export const USER_APPLICATIONS_FILTERS_CONFIG = {
   selectColumns: {
     id: true,
     name: true,
@@ -10,6 +10,8 @@ export const USER_FILTERS_CONFIG = {
     status: true,
     availableApps: true,
     availableAppsIDs: true,
+    organizationId: true,
+    organizationAlias: true,
   },
   searchableColumns: ['name', 'email'],
   defaultSortBy: 'name',
diff --git a/backend/src/modules/user/entities/user-applications-view.entity.ts b/backend/src/modules/user/entities/user-applications-view.entity.ts
index 05acfde5e..b7c0b1752 100644
--- a/backend/src/modules/user/entities/user-applications-view.entity.ts
+++ b/backend/src/modules/user/entities/user-applications-view.entity.ts
@@ -17,29 +17,27 @@ import { Role } from '../enums/role.enum';
 
 @ViewEntity('UserApplicationsView', {
   expression: `
-        SELECT
-            u.id,
-            u.name,
-            u.email,
-            u.phone,
-            u.status,
-            u.role,
-            u.organization_id as "organizationId",
-            u.created_on as "createdOn",
-            u.updated_on as "updatedOn",
-            ARRAY_AGG(DISTINCT a.id) as "availableAppsIDs",
-            json_agg(json_build_object('id', a.id, 'name', a.name, 'type', a.type)) as "availableApps"
-        FROM
-            "user" u
-        LEFT JOIN user_ong_application uoa ON u.id = uoa.user_id AND uoa.status = 'active'
-        LEFT JOIN ong_application oa ON uoa.ong_application_id = oa.id AND oa.status = 'active'
-        LEFT JOIN application a ON (oa.application_id = a.id OR a.type = 'independent') AND a.status = 'active'
-        WHERE
-            "u"."role" = 'employee' AND
-            "u"."status" IN('active', 'restricted') AND
-            "u"."deleted_on" IS NULL
-        GROUP BY
-            u.id
+      SELECT u.id,
+          u.name,
+          u.email,
+          u.phone,
+          u.status,
+          u.role,
+          u.organization_id AS "organizationId",
+          u.created_on AS "createdOn",
+          u.updated_on AS "updatedOn",
+          og.alias as "organizationAlias",
+          array_agg(DISTINCT a.id) AS "availableAppsIDs",
+          json_agg(DISTINCT jsonb_build_object('id', a.id, 'name', a.name, 'type', a.type)) AS "availableApps"
+        FROM "user" u
+          LEFT JOIN user_ong_application uoa ON u.id = uoa.user_id AND uoa.status = 'active'::user_ong_application_status_enum
+          LEFT JOIN ong_application oa ON uoa.ong_application_id = oa.id AND oa.status = 'active'::ong_application_status_enum
+          LEFT JOIN application a ON (oa.application_id = a.id OR a.type = 'independent'::application_type_enum) AND a.status = 'active'::application_status_enum
+          LEFT JOIN organization o ON u.organization_id = o.id
+          LEFT JOIN organization_general og ON o.organization_general_id = og.id
+      WHERE u.role = 'employee'::user_role_enum AND (u.status = ANY (ARRAY['active'::user_status_enum, 'restricted'::user_status_enum])) AND u.deleted_on IS NULL
+      GROUP BY u.id, og.alias;
+
   `,
 })
 export class UserApplicationsView {
@@ -75,4 +73,7 @@ export class UserApplicationsView {
 
   @ViewColumn()
   organizationId: number;
+
+  @ViewColumn()
+  organizationAlias: string;
 }
diff --git a/backend/src/modules/user/services/user.service.ts b/backend/src/modules/user/services/user.service.ts
index a3acd1a02..1e7a6b941 100644
--- a/backend/src/modules/user/services/user.service.ts
+++ b/backend/src/modules/user/services/user.service.ts
@@ -16,7 +16,7 @@ import {
   Not,
   UpdateResult,
 } from 'typeorm';
-import { USER_FILTERS_CONFIG } from '../constants/user-filters.config';
+import { USER_APPLICATIONS_FILTERS_CONFIG } from '../constants/user-filters.config';
 import { CreateUserDto } from '../dto/create-user.dto';
 import { UpdateUserDto } from '../dto/update-user.dto';
 import { UserFilterDto } from '../dto/user-filter.dto';
@@ -194,26 +194,7 @@ export class UserService {
 
     // For Admin user we will sort by organizationId
     return this.userApplicationsView.getManyPaginated(
-      USER_FILTERS_CONFIG,
-      organizationId
-        ? { ...paginationOptions, organizationId }
-        : paginationOptions,
-    );
-  }
-
-  public async findAll(
-    options: UserFilterDto,
-    organizationId?: number,
-  ): Promise<Pagination<User>> {
-    const paginationOptions: any = {
-      role: Role.EMPLOYEE,
-      status: `$in:${UserStatus.ACTIVE},${UserStatus.RESTRICTED}`,
-      ...options,
-    };
-
-    // For Admin user we will sort by organizationId
-    return this.userRepository.getManyPaginated(
-      USER_FILTERS_CONFIG,
+      USER_APPLICATIONS_FILTERS_CONFIG,
       organizationId
         ? { ...paginationOptions, organizationId }
         : paginationOptions,
@@ -353,7 +334,7 @@ export class UserService {
 
     // For Admin user we will sort by organizationId
     const users = await this.userApplicationsView.getManyPaginated(
-      USER_FILTERS_CONFIG,
+      USER_APPLICATIONS_FILTERS_CONFIG,
       organizationId
         ? { ...paginationOptions, organizationId }
         : paginationOptions,
diff --git a/backend/src/shared/controllers/nomenclatures.controller.ts b/backend/src/shared/controllers/nomenclatures.controller.ts
index 4a3baadbc..26060590d 100644
--- a/backend/src/shared/controllers/nomenclatures.controller.ts
+++ b/backend/src/shared/controllers/nomenclatures.controller.ts
@@ -73,4 +73,9 @@ export class NomenclaturesController {
   getBeneficiaries() {
     return this.nomenclaturesService.getBeneficiaries({});
   }
+
+  @Get('issuers')
+  getIssuers() {
+    return this.nomenclaturesService.getIssuers({});
+  }
 }
diff --git a/backend/src/shared/entities/index.ts b/backend/src/shared/entities/index.ts
index 835d9bf8e..62e0463f6 100644
--- a/backend/src/shared/entities/index.ts
+++ b/backend/src/shared/entities/index.ts
@@ -6,3 +6,4 @@ export * from './federation.entity';
 export * from './coalition.entity';
 export * from './faculty.entity';
 export * from './skill.entity';
+export * from './issuer.entity';
diff --git a/backend/src/shared/entities/issuer.entity.ts b/backend/src/shared/entities/issuer.entity.ts
new file mode 100644
index 000000000..2b895d243
--- /dev/null
+++ b/backend/src/shared/entities/issuer.entity.ts
@@ -0,0 +1,8 @@
+import { BaseEntity } from 'src/common/base/base-entity.class';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: '_issuer' })
+export class Issuer extends BaseEntity {
+  @Column({ type: 'text', name: 'name' })
+  name: string;
+}
diff --git a/backend/src/shared/services/nomenclatures.service.ts b/backend/src/shared/services/nomenclatures.service.ts
index 336ff626c..af2d37465 100644
--- a/backend/src/shared/services/nomenclatures.service.ts
+++ b/backend/src/shared/services/nomenclatures.service.ts
@@ -5,6 +5,7 @@ import {
   County,
   Domain,
   Faculty,
+  Issuer,
   Region,
   Skill,
 } from 'src/shared/entities';
@@ -42,6 +43,8 @@ export class NomenclaturesService {
     private readonly serviceDomainRepository: Repository<ServiceDomain>,
     @InjectRepository(Beneficiary)
     private readonly beneficiaryRepository: Repository<Beneficiary>,
+    @InjectRepository(Issuer)
+    private readonly issuersRepository: Repository<Issuer>,
   ) {}
 
   public getCity(conditions: FindOneOptions<City>) {
@@ -162,4 +165,8 @@ export class NomenclaturesService {
   public getBeneficiaries(conditions: FindManyOptions<Beneficiary>) {
     return this.beneficiaryRepository.find(conditions);
   }
+
+  public getIssuers(conditions: FindManyOptions<Issuer>) {
+    return this.issuersRepository.find(conditions);
+  }
 }
diff --git a/backend/src/shared/services/s3-file-manager.service.ts b/backend/src/shared/services/s3-file-manager.service.ts
index 0dee77d43..2c7139986 100644
--- a/backend/src/shared/services/s3-file-manager.service.ts
+++ b/backend/src/shared/services/s3-file-manager.service.ts
@@ -95,17 +95,18 @@ export class S3FileManagerService {
     path: string,
     files: Express.Multer.File[],
     fileType: FILE_TYPE,
-    fileName?: string,
   ): Promise<string[]> {
     this.logger.log(`Preparing to upload ${files.length} files...`);
 
     this.validateFiles(files, fileType);
 
+    const extension = files[0].originalname.split('.').pop();
+
     // Create upload params
     const params: FileUploadParams[] = files.map((file) => ({
       Body: file.buffer,
       Bucket: this.configService.get('AWS_S3_BUCKET_NAME'),
-      Key: `${path}/${uuid()}`,
+      Key: `${path}/${uuid()}.${extension}`,
     }));
 
     // Prepare upload
diff --git a/backend/src/shared/shared.module.ts b/backend/src/shared/shared.module.ts
index b7a4769c0..dc13eab07 100644
--- a/backend/src/shared/shared.module.ts
+++ b/backend/src/shared/shared.module.ts
@@ -9,6 +9,7 @@ import {
   Domain,
   Faculty,
   Federation,
+  Issuer,
   Region,
   Skill,
 } from './entities';
@@ -35,6 +36,7 @@ import { Beneficiary } from 'src/modules/civic-center-service/entities/beneficia
       PracticeDomain,
       ServiceDomain,
       Beneficiary,
+      Issuer,
     ]),
     HttpModule,
   ],
diff --git a/frontend/src/assets/locales/en/translation.json b/frontend/src/assets/locales/en/translation.json
index 27b6549ca..921f3e26a 100644
--- a/frontend/src/assets/locales/en/translation.json
+++ b/frontend/src/assets/locales/en/translation.json
@@ -35,7 +35,7 @@
     "show_more": "See all",
     "show_less": "Show less",
     "upload": {
-      "file": "Only PDF files are allowed for the organisation's status.",
+      "file": "Only PDF files are allowed for upload.",
       "image": "Only PNG, JPG, JPEG files are allowed for the logo",
       "image_size": "The maximum size for the logo is 6 MB",
       "document_size": "The maximum size for the organisation's charter is 25 MB",
@@ -494,9 +494,22 @@
     "other_information": "This information will be public, be careful what you share.",
     "statute": "The status of the organisation",
     "statute_information": "This information will be public, be careful what you share.",
-    "document": "Document",
+    "no_document": "No document uploaded",
     "file_name": "Statute_Organisation",
     "statute_upload": "Upload file",
+
+    "non_political_affiliation": "Declaration of non-political affiliation",
+    "non_political_affiliation_information": "Upload the self-declaration by the legal representative of the organization stating that the president and members of the Board of Directors are not part of the leadership of a political party and/or do not hold any public office. This declaration will not be displayed publicly. The document is only used to validate the organization's eligibility to access certain solutions in NGO Hub (such as Vot ONG and RO Help). Accepted file formats: pdf, maximum 25 MB",
+    "non_political_affiliation_no_document": "No document uploaded",
+    "non_political_affiliation_file_name": "Declaration of non-political affiliation",
+    "non_political_affiliation_upload": "Upload file",
+
+    "balance_sheet": "Balance Sheet",
+    "balance_sheet_information": "Upload the latest balance sheet submitted to the Ministry of Finance. This will not be displayed publicly. The document is only used to validate the organization's eligibility to access certain solutions in NGO Hub (such as Vot ONG and RO Help). Accepted file formats: pdf, maximum 50 MB",
+    "balance_sheet_no_document": "No document uploaded",
+    "balance_sheet_file_name": "Balance Sheet",
+    "balance_sheet_upload": "Upload file",
+
     "modal": {
       "add": "Add",
       "edit_director": "Editing of the Board member",
@@ -518,6 +531,16 @@
       "title": "Are you sure you want to delete the Organisation's Constitution?",
       "description": "TODO#1: Lorem ipsum."
     },
+
+    "delete_non_politicial_affiliation_modal": {
+      "title": "Are you sure you want to delete the Declaration of non-political affiliation?",
+      "description": ""
+    },
+
+    "delete_balance_sheet_modal": {
+      "title": "Are you sure you want to delete the Balance Sheet?",
+      "description": ""
+    },
     "header": {
       "name": "Full name",
       "role": "Role",
@@ -843,13 +866,16 @@
       "email": "E-mail",
       "phone": "Phone",
       "status": "General access",
-      "created": "Date added"
+      "created": "Date added",
+      "organizationAlias": "Organization"
     },
     "invites_header": {
       "name": "Name",
       "email": "E-mail",
       "phone": "Phone",
-      "added_on": "Date added"
+      "added_on": "Date added",
+      "role": "Role",
+      "organizationAlias": "Organization"
     },
     "status": {
       "active": "Activ",
@@ -1580,4 +1606,4 @@
       "date_added": "Date of feedback"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/src/assets/locales/ro/translation.json b/frontend/src/assets/locales/ro/translation.json
index 64a9979d4..0e215641a 100644
--- a/frontend/src/assets/locales/ro/translation.json
+++ b/frontend/src/assets/locales/ro/translation.json
@@ -35,12 +35,12 @@
     "show_more": "Vezi tot",
     "show_less": "Arată mai puțin",
     "upload": {
-      "file": "Numai fișiere de tip PDF sunt permise pentru statutul organizației.",
+      "file": "Numai fișiere de tip PDF sunt permise pentru incarcare.",
       "image": "Numai fișiere de tip PNG, JPG, JPEG sunt permise pentru logo",
       "image_size": "Dimensiunea maximă pentru logo este de 6 MB",
-      "document_size": "Dimensiunea maximă pentru statutul organizației este de 25 MB",
+      "document_size": "Dimensiunea maximă pentru fișiere este de 25 MB",
       "logo": "Eroare la încărcarea logo-ului",
-      "statute": "Eroare la încărcarea statutului organizației"
+      "statute": "Eroare la încărcarea fișierului"
     },
     "filters": {
       "hide": "Ascunde filtre",
@@ -183,6 +183,8 @@
         "REQ_010": "Există deja o organizație cu acest alias",
         "REQ_011": "Există deja o organizație cu acest e-mail",
         "REQ_012": "Există deja o organizație cu acest număr de telefon",
+        "REQ_013": "Există deja o organizație cu acest număr si dată de înscriere în Registrul Special",
+        "REQ_014": "Există deja o organizație cu acest număr de înregistrare în Registrul Național",
         "REQ_002": "Există deja o cerere cu acest e-mail sau cu acest număr de telefon.",
         "ORG_026": "Eroare la actualizarea datelor generale"
       }
@@ -312,6 +314,40 @@
         "label": "Număr de înregistrare în RAF*",
         "placeholder": "56/14.09.2020"
       },
+      "association_registry_number": {
+        "required": "Numărul de înregistrare în Registrul Special este obligatoriu",
+        "max": "Numărul de înregistrare în Registrul Special poate avea maxim 30 de caractere",
+        "helper": "Numărul care apare pe Certificatul de înscriere a persoanei juridice fără scop patrimonial.",
+        "label": "Număr si data de înscriere în Registrul Special",
+        "placeholder": "123/14.09.2020"
+      },
+      "association_registry_part": {
+        "required": "Partea din Registrul Special este obligatorie",
+        "max": "Partea din Registrul Special poate avea maxim 10 de caractere",
+        "helper": "Partea care apare pe Certificatul de înscriere a persoanei juridice fără scop patrimonial, după număr, și dată. A corespunde asociațiilor, B fundațiilor, C federațiilor.",
+        "label": "Partea",
+        "placeholder": "A"
+      },
+      "association_registry_section": {
+        "required": "Secțiunea din Registrul Special este obligatorie",
+        "max": "Secțiunea din Registrul Special poate avea maxim 10 de caractere",
+        "helper": "Secțiunea care apare pe Certificatul de înscriere a persoanei juridice fără scop patrimonial, după număr, dată și parte.",
+        "label": "Secțiunea",
+        "placeholder": "I"
+      },
+      "association_registry_issuer": {
+        "required": "Emitentul Registrului Special este obligatoriu",
+        "max": "Emitentul Registrului Special poate avea maxim 100 de caractere",
+        "helper": "Selectează din lista instanțelor de judecată, instanța care a conferit organizației statutul juridic. Instanța emitentă se află în antetul Certificatului de înscriere a persoanei juridice fără scop patrimonial.",
+        "label": "Instanța emitentă"
+      },
+      "national_registry_number": {
+        "required": "Numărul de înregistrare în Registrul Național este obligatoriu",
+        "max": "Numărul de înregistrare în Registrul Național poate avea maxim 30 de caractere",
+        "helper": "Acest număr se regăsește pe extrasele din Registrul Național pe care le solicitați (de exemplu pentru actualizarea anuală a datelor la bancă). Numărul poate fi regăsit și pe site-ul Ministerului Justiției - https://www.just.ro/registrul-national-ong/",
+        "label": "Numărul de înregistrare în Registrul Național, oferit de Ministerul Justiției",
+        "placeholder": "123/A/2020"
+      },
       "city": {
         "required": "Localitatea este obligatorie",
         "label": "Localitate*"
@@ -497,9 +533,23 @@
     "other_information": "Numele persoanelor adăugate sunt pentru a ușura comunicarea cu diferite persoane din organizația ta. De exemplu, aici poți adăuga managerul de comunicare sau persoana de fundraising dedicată din ONG-ul tău, sau coordonatori de sucursale din alte orașe. Datele de contact ale persoanelor relevante nu vor fi afișate public.",
     "statute": "Statutul organizației",
     "statute_information": "Încarcă statutul anonimizat. Acesta nu va fi afișat public. Documentul este folosit doar pentru a valida statutul de organizație neguvernamentală, și a confirma că scopul și misiunea organizației nu contravin cu criteliile de eligibilitate (ca de exemplu organizația pe care o reprezinți nu desfășoară activități care să încalce drepturile omului, nu este afiliată unui partid politic, nu este o asociație de locatari, etc.) Fișiere acceptate: pdf, maxim 25 MB.",
-    "document": "Document",
+
+    "no_document": "Nu există niciun document adăugat",
     "file_name": "Statut_Organizație",
     "statute_upload": "Încarcă fișier",
+
+    "non_political_affiliation": "Declarație de neapartenență politică",
+    "non_political_affiliation_information": "Încarcă declarația pe proprie răspundere prin care reprezentantul legal al organizației declară că președintele și membrii Consiliul Director nu fac parte din conducerea unui partid politic și/sau nu dețin nicio funcție publică. Această declarație nu va fi afișată public. Documentul este folosit doar pentru a valida eligibilitatea organizației de a accesa anumite soluții din NGO Hub (ca de exemplu Vot ONG și RO Help). Fișiere acceptate: pdf, maxim 25 MB",
+    "non_political_affiliation_no_document": "Nu există niciun document adăugat",
+    "non_political_affiliation_file_name": "Declarație de neapartenență politică",
+    "non_political_affiliation_upload": "Încarcă fișier",
+
+    "balance_sheet": "Bilanț contabil",
+    "balance_sheet_information": "Încarcă ultimul bilanțul contabil depus la Ministerul de Finanțe. Acesta nu va fi afișat public. Documentul este folosit doar pentru a valida eligibilitatea organizației de a accesa anumite soluții din NGO Hub (ca de exemplu Vot ONG și RO Help). Fișiere acceptate: pdf, maxim 25 MB",
+    "balance_sheet_no_document": "Nu există niciun document adăugat",
+    "balance_sheet_file_name": "Bilanț contabil",
+    "balance_sheet_upload": "Încarcă fișier",
+
     "modal": {
       "add": "Adaugă",
       "edit_director": "Editare membru Consiliu Director",
@@ -521,11 +571,22 @@
       "title": "Ești sigur ca dorești ștergerea Statutului Organizației?",
       "description": "În cazul ștergerii statutului, un nou statut trebuie încărcat în maxim 30 de zile pentru a menține activ contul organizației în NGO Hub."
     },
+
+    "delete_non_politicial_affiliation_modal": {
+      "title": "Ești sigur ca dorești ștergerea Declarației de neapartenență politică?",
+      "description": ""
+    },
+
+    "delete_balance_sheet_modal": {
+      "title": "Ești sigur ca dorești ștergerea Bilanțului contabil?",
+      "description": ""
+    },
     "header": {
       "name": "Nume și prenume",
       "role": "Rol",
       "email": "E-mail",
-      "phone": "Telefon"
+      "phone": "Telefon",
+      "role": "Rol"
     },
     "legal_config": {
       "name": {
@@ -547,6 +608,10 @@
         "minim": "Numărul de telefon al reprezentantului legal nu poate avea mai puțin de 10 caractere.",
         "invalid": "Numărul de telefon are un format invalid.",
         "label": "Telefon"
+      },
+      "role": {
+        "maxim": "Rolul reprezentantului legal nu poate avea mai mult de 50 de caractere.",
+        "label": "Rol"
       }
     },
     "director_config": {
@@ -569,6 +634,10 @@
         "minim": "Numărul de telefon al membrului Consiliului Director nu poate avea mai puțin de 10 caractere.",
         "invalid": "Numărul de telefon are un format invalid.",
         "label": "Telefon"
+      },
+      "role": {
+        "maxim": "Rolul membrului Consiliului Director nu poate avea mai mult de 50 de caractere.",
+        "label": "Rol"
       }
     },
     "other_config": {
@@ -846,13 +915,16 @@
       "email": "E-mail",
       "phone": "Telefon",
       "status": "Acces general",
-      "created": "Data adăugării"
+      "created": "Data adăugării",
+      "organizationAlias": "Organizație"
     },
     "invites_header": {
       "name": "Nume",
       "email": "E-mail",
       "phone": "Telefon",
-      "added_on": "Data adăugării"
+      "added_on": "Data adăugării",
+      "role": "Rol",
+      "organizationAlias": "Organizație"
     },
     "status": {
       "active": "Activ",
@@ -1584,4 +1656,4 @@
       "date_added": "Data acordării feedback-ului"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/src/common/constants/error.constants.ts b/frontend/src/common/constants/error.constants.ts
index 5c660a371..0398b5c36 100644
--- a/frontend/src/common/constants/error.constants.ts
+++ b/frontend/src/common/constants/error.constants.ts
@@ -10,6 +10,8 @@ export const ORGANIZATION_ERRORS: Record<string, string> = {
   REQ_010: i18n.t('organization:create.errors.REQ_010'),
   REQ_011: i18n.t('organization:create.errors.REQ_011'),
   REQ_012: i18n.t('organization:create.errors.REQ_012'),
+  REQ_013: i18n.t('organization:create.errors.REQ_013'),
+  REQ_014: i18n.t('organization:create.errors.REQ_014'),
   UPDATE_GENERAL: i18n.t('organization:create.errors.ORG_026'),
 };
 
diff --git a/frontend/src/common/constants/file.constants.ts b/frontend/src/common/constants/file.constants.ts
index 3d0bfc3cb..8403b28a2 100644
--- a/frontend/src/common/constants/file.constants.ts
+++ b/frontend/src/common/constants/file.constants.ts
@@ -1,5 +1,7 @@
 export const FILE_TYPES_ACCEPT = {
   LOGO: 'image/png, image/jpeg, image/svg',
   STATUTE: '.pdf',
+  NON_POLITICAL_AFFILIATION: '.pdf',
+  BALANCE_SHEET: '.pdf',
   EXCEL: '.xls,.xlsx',
 };
diff --git a/frontend/src/common/errors/entities/create-organization-errors.class.ts b/frontend/src/common/errors/entities/create-organization-errors.class.ts
index 28edc3897..4cf723a01 100644
--- a/frontend/src/common/errors/entities/create-organization-errors.class.ts
+++ b/frontend/src/common/errors/entities/create-organization-errors.class.ts
@@ -10,6 +10,8 @@ export const enum CREATE_ORGANIZARION_ERRORS {
   REQ_010 = 'REQ_010',
   REQ_011 = 'REQ_011',
   REQ_012 = 'REQ_012',
+  REQ_013 = 'REQ_013',
+  REQ_014 = 'REQ_014',
   FILE_002 = 'FILE_002',
   FILE_003 = 'FILE_003',
   FILE_004 = 'FILE_004',
@@ -39,6 +41,8 @@ export class CreateOrganizationError extends ErrorClass<CREATE_ORGANIZARION_ERRO
       [CREATE_ORGANIZARION_ERRORS.REQ_010]: i18n.t('organization:create.errors.REQ_010'),
       [CREATE_ORGANIZARION_ERRORS.REQ_011]: i18n.t('organization:create.errors.REQ_011'),
       [CREATE_ORGANIZARION_ERRORS.REQ_012]: i18n.t('organization:create.errors.REQ_012'),
+      [CREATE_ORGANIZARION_ERRORS.REQ_013]: i18n.t('organization:create.errors.REQ_013'),
+      [CREATE_ORGANIZARION_ERRORS.REQ_014]: i18n.t('organization:create.errors.REQ_014'),
     });
   }
 
diff --git a/frontend/src/common/interfaces/issuer.interface.ts b/frontend/src/common/interfaces/issuer.interface.ts
new file mode 100644
index 000000000..c1e7dfa98
--- /dev/null
+++ b/frontend/src/common/interfaces/issuer.interface.ts
@@ -0,0 +1,3 @@
+import { BaseNomenclatureEntity } from './base-nomenclature-entity.interface';
+
+export interface Issuer extends BaseNomenclatureEntity {}
diff --git a/frontend/src/common/router/Routes.constants.ts b/frontend/src/common/router/Routes.constants.ts
index 304cd3963..88eaeda50 100644
--- a/frontend/src/common/router/Routes.constants.ts
+++ b/frontend/src/common/router/Routes.constants.ts
@@ -35,6 +35,7 @@ export const ADMIN_ROUTES = [
 export const SUPER_ADMIN_ROUTES = [
   { id: 0, name: translations.dashboard, href: '', icon: RectangleGroupIcon },
   { id: 1, name: translations.organizations, href: 'organizations', icon: CircleStackIcon },
-  { id: 2, name: translations.requests, href: 'requests', icon: UserPlusIcon },
-  { id: 3, name: translations.store, href: 'applications', icon: RectangleStackIcon },
+  { id: 2, name: translations.users, href: 'users/list', icon: UserGroupIcon },
+  { id: 3, name: translations.requests, href: 'requests', icon: UserPlusIcon },
+  { id: 4, name: translations.store, href: 'applications', icon: RectangleStackIcon },
 ];
diff --git a/frontend/src/components/Select/Select.tsx b/frontend/src/components/Select/Select.tsx
index ad39e6b68..080960709 100644
--- a/frontend/src/components/Select/Select.tsx
+++ b/frontend/src/components/Select/Select.tsx
@@ -11,6 +11,7 @@ const Select = (props: {
     collection: any[];
     displayedAttribute: string;
     id?: string;
+    helperText?: string;
   };
   selected?: any;
   error?: string | any;
@@ -46,10 +47,10 @@ const Select = (props: {
                     {(props.config.displayedAttribute && props.selected
                       ? props.selected[props.config.displayedAttribute]
                       : props.selected) || (
-                      <span className="text-gray-700 font-normal sm:text-sm lg:text-base text-xs">
-                        {props.config.label}
-                      </span>
-                    )}
+                        <span className="text-gray-700 font-normal sm:text-sm lg:text-base text-xs">
+                          {props.config.label}
+                        </span>
+                      )}
                   </span>
                   <span className="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
                     <ChevronUpDownIcon className="h-5 w-5 text-gray-400" aria-hidden="true" />
@@ -115,6 +116,11 @@ const Select = (props: {
           {props.error}
         </p>
       )}
+      {!props.error && !props.readonly && (
+        <p className="mt-1 sm:text-sm text-xs text-gray-500 font-normal" id="email-description">
+          {props.config.helperText}
+        </p>
+      )}
     </div>
   );
 };
diff --git a/frontend/src/pages/create-organziation/CreateOrganization.tsx b/frontend/src/pages/create-organziation/CreateOrganization.tsx
index b65d0fd0e..516716e9d 100644
--- a/frontend/src/pages/create-organziation/CreateOrganization.tsx
+++ b/frontend/src/pages/create-organziation/CreateOrganization.tsx
@@ -7,7 +7,7 @@ import { InternalErrors } from '../../common/errors/internal-errors';
 import { mapSelectToValue } from '../../common/helpers/format.helper';
 import Header from '../../components/Header/Header';
 import { Loading } from '../../components/loading/Loading';
-import { useCountiesQuery } from '../../services/nomenclature/Nomenclature.queries';
+import { useCountiesQuery, useIssuersQuery } from '../../services/nomenclature/Nomenclature.queries';
 import { useCreateOrganizationRequestMutation } from '../../services/request/Request.queries';
 import ProgressSteps from './components/ProgressSteps';
 import {
@@ -42,6 +42,7 @@ const CreateOrganization = () => {
   const { t } = useTranslation(['organization', 'common']);
 
   useCountiesQuery();
+  useIssuersQuery();
 
   useEffect(() => {
     const { activeStepIndex } = JSON.parse(
diff --git a/frontend/src/pages/create-organziation/components/CreateOrganizationGeneral.tsx b/frontend/src/pages/create-organziation/components/CreateOrganizationGeneral.tsx
index e02a36d06..b75b1c5dc 100644
--- a/frontend/src/pages/create-organziation/components/CreateOrganizationGeneral.tsx
+++ b/frontend/src/pages/create-organziation/components/CreateOrganizationGeneral.tsx
@@ -13,7 +13,7 @@ import Select from '../../../components/Select/Select';
 import Textarea from '../../../components/Textarea/Textarea';
 import ErrorsBanner from '../../../components/errors-banner/ErrorsBanner';
 import SectionHeader from '../../../components/section-header/SectionHeader';
-import { useCitiesQuery } from '../../../services/nomenclature/Nomenclature.queries';
+import { useCitiesQuery, useIssuersQuery } from '../../../services/nomenclature/Nomenclature.queries';
 import { useCreateOrganizationRequestValidationMutation } from '../../../services/request/Request.queries';
 import { useNomenclature } from '../../../store/selectors';
 import { OrganizationGeneralConfig } from '../../organization/components/OrganizationGeneral/OrganizationGeneralConfig';
@@ -31,7 +31,7 @@ const CreateOrganizationGeneral = () => {
   const [organizationCounty, setOrganizationCounty] = useState<any>();
   const [organizationCity, setOrganizationCity] = useState<any>();
   const [validationErrors, setValidationErrors] = useState<string[]>([]);
-  const { cities, counties } = useNomenclature();
+  const { cities, counties, issuers } = useNomenclature();
 
   const [organization, setOrganization, logo, setLogo, , , activeStepIndex, setActiveStepIndex] =
     useOutletContext<any>();
@@ -258,20 +258,109 @@ const CreateOrganizationGeneral = () => {
                 }}
               />
               <Controller
-                key={OrganizationGeneralConfig.rafNumber.key}
-                name={OrganizationGeneralConfig.rafNumber.key}
-                rules={OrganizationGeneralConfig.rafNumber.rules}
+                key={OrganizationGeneralConfig.associationRegistryNumber.key}
+                name={OrganizationGeneralConfig.associationRegistryNumber.key}
+                rules={OrganizationGeneralConfig.associationRegistryNumber.rules}
                 control={control}
                 render={({ field: { onChange, value } }) => {
                   return (
                     <InputField
                       config={{
-                        ...OrganizationGeneralConfig.rafNumber.config,
-                        name: OrganizationGeneralConfig.rafNumber.key,
-                        error: errors[OrganizationGeneralConfig.rafNumber.key]?.message,
+                        ...OrganizationGeneralConfig.associationRegistryNumber.config,
+                        name: OrganizationGeneralConfig.associationRegistryNumber.key,
+                        error: errors[OrganizationGeneralConfig.associationRegistryNumber.key]?.message,
                         defaultValue: value,
                         onChange: onChange,
-                        id: 'create-organization-general__org-raf',
+                        id: 'organization-general__associationRegistryNumber',
+                      }}
+                      readonly={readonly}
+                    />
+                  );
+                }}
+              />
+
+              <Controller
+                key={OrganizationGeneralConfig.associationRegistryPart.key}
+                name={OrganizationGeneralConfig.associationRegistryPart.key}
+                rules={OrganizationGeneralConfig.associationRegistryPart.rules}
+                control={control}
+                render={({ field: { onChange, value } }) => {
+                  return (
+                    <InputField
+                      config={{
+                        ...OrganizationGeneralConfig.associationRegistryPart.config,
+                        name: OrganizationGeneralConfig.associationRegistryPart.key,
+                        error: errors[OrganizationGeneralConfig.associationRegistryPart.key]?.message,
+                        defaultValue: value,
+                        onChange: onChange,
+                        id: 'organization-general__associationRegistryPart',
+                      }}
+                      readonly={readonly}
+                    />
+                  );
+                }}
+              />
+
+              <Controller
+                key={OrganizationGeneralConfig.associationRegistrySection.key}
+                name={OrganizationGeneralConfig.associationRegistrySection.key}
+                rules={OrganizationGeneralConfig.associationRegistrySection.rules}
+                control={control}
+                render={({ field: { onChange, value } }) => {
+                  return (
+                    <InputField
+                      config={{
+                        ...OrganizationGeneralConfig.associationRegistrySection.config,
+                        name: OrganizationGeneralConfig.associationRegistrySection.key,
+                        error: errors[OrganizationGeneralConfig.associationRegistrySection.key]?.message,
+                        defaultValue: value,
+                        onChange: onChange,
+                        id: 'organization-general__associationRegistrySection',
+                      }}
+                      readonly={readonly}
+                    />
+                  );
+                }}
+              />
+
+              <Controller
+                key={OrganizationGeneralConfig.associationRegistryIssuer.key}
+                name={OrganizationGeneralConfig.associationRegistryIssuer.key}
+                rules={OrganizationGeneralConfig.associationRegistryIssuer.rules}
+                control={control}
+                render={({ field: { onChange, value } }) => {
+                  return (
+                    <Select
+                      config={{
+                        ...OrganizationGeneralConfig.associationRegistryIssuer.config,
+                        collection: issuers,
+                        displayedAttribute: 'name',
+                        id: 'organization-general__associationRegistryIssuer',
+                      }}
+                      error={errors[OrganizationGeneralConfig.associationRegistryIssuer.key]?.message}
+                      selected={value}
+                      onChange={onChange}
+                      readonly={readonly}
+                    />
+                  );
+                }}
+              />
+
+              <Controller
+                key={OrganizationGeneralConfig.nationalRegistryNumber.key}
+                name={OrganizationGeneralConfig.nationalRegistryNumber.key}
+                rules={OrganizationGeneralConfig.nationalRegistryNumber.rules}
+                control={control}
+                render={({ field: { onChange, value } }) => {
+                  return (
+                    <InputField
+                      config={{
+                        ...OrganizationGeneralConfig.nationalRegistryNumber.config,
+                        name: OrganizationGeneralConfig.nationalRegistryNumber.key,
+                        error: errors[OrganizationGeneralConfig.nationalRegistryNumber.key]?.message,
+                        defaultValue: value,
+                        onChange: onChange,
+                        id: 'organization-general__nationalRegistryNumberr',
                       }}
                       readonly={readonly}
                     />
diff --git a/frontend/src/pages/create-organziation/components/CreateOrganizationLegal.tsx b/frontend/src/pages/create-organziation/components/CreateOrganizationLegal.tsx
index 259198820..4871ddf27 100644
--- a/frontend/src/pages/create-organziation/components/CreateOrganizationLegal.tsx
+++ b/frontend/src/pages/create-organziation/components/CreateOrganizationLegal.tsx
@@ -90,6 +90,7 @@ const CreateOrganizationLegal = () => {
       fullName: legal.legalReprezentative_fullName,
       phone: legal.legalReprezentative_phone,
       email: legal.legalReprezentative_email,
+      role: legal.legalReprezentative_role,
     };
 
     //Using isValidating because RHF triggers 2 renders and update local storage with invalid data
@@ -184,7 +185,8 @@ const CreateOrganizationLegal = () => {
         !(
           director.fullName === selectedDirector?.fullName &&
           director.email === selectedDirector?.email &&
-          director.phone === selectedDirector?.phone
+          director.phone === selectedDirector?.phone &&
+          director.role === selectedDirector?.role
         ),
     );
     setDirectors([...filteredDirectors, { ...selectedDirector, ...contact }]);
@@ -206,7 +208,8 @@ const CreateOrganizationLegal = () => {
         !(
           director.fullName === selectedDirector?.fullName &&
           director.email === selectedDirector?.email &&
-          director.phone === selectedDirector?.phone
+          director.phone === selectedDirector?.phone &&
+          director.role === selectedDirector?.role
         ),
     );
     setDirectors(filteredDirectors);
@@ -278,6 +281,7 @@ const CreateOrganizationLegal = () => {
       fullName: data.legalReprezentative_fullName,
       phone: data.legalReprezentative_phone,
       email: data.legalReprezentative_email,
+      role: data.legalReprezentative_role,
     };
 
     // updateActiveStepIndexInLocalStorage(activeStepIndex, 4, setActiveStepIndex);
@@ -295,7 +299,7 @@ const CreateOrganizationLegal = () => {
             <SectionHeader title={t('representative')} subTitle={t('representative_information')} />
             <form className="space-y-8">
               <ContactForm
-                className="flex-row gap-x-6 sm:flex-nowrap flex-wrap"
+                className="flex-row gap-x-6 flex-wrap"
                 control={control}
                 errors={errors}
                 readonly={!isEditMode}
@@ -303,6 +307,7 @@ const CreateOrganizationLegal = () => {
                   OrganizationLegalConfig.legal_reprezentative_name,
                   OrganizationLegalConfig.legal_reprezentative_email,
                   OrganizationLegalConfig.legal_reprezentative_phone,
+                  OrganizationLegalConfig.legal_reprezentative_role,
                 ]}
                 id="create-organization-legal"
               />
diff --git a/frontend/src/pages/create-organziation/interfaces/CreateOrganization.interface.ts b/frontend/src/pages/create-organziation/interfaces/CreateOrganization.interface.ts
index 33f6a2c7a..1f8a3ee56 100644
--- a/frontend/src/pages/create-organziation/interfaces/CreateOrganization.interface.ts
+++ b/frontend/src/pages/create-organziation/interfaces/CreateOrganization.interface.ts
@@ -1,5 +1,6 @@
 import { City } from '../../../common/interfaces/city.interface';
 import { County } from '../../../common/interfaces/county.interface';
+import { Issuer } from '../../../common/interfaces/issuer.interface';
 import { Person } from '../../../common/interfaces/person.interface';
 import { OrganizationAreaEnum } from '../../organization/components/OrganizationActivity/OrganizationActivityConfig';
 import { OrganizationTypeEnum } from '../../organization/enums/OrganizationType.enum';
@@ -27,7 +28,12 @@ export interface ICreateOrganizationGeneral {
   phone: string;
   yearCreated: number;
   cui: string;
-  rafNumber: string;
+  associationRegistryNumber: string;
+  associationRegistryPart: string;
+  associationRegistrySection: string;
+  associationRegistryIssuerId: number;
+  associationRegistryIssuer: Issuer;
+  nationalRegistryNumber: string;
   shortDescription: string;
   description: string;
   logo?: string;
diff --git a/frontend/src/pages/organization/Organization.tsx b/frontend/src/pages/organization/Organization.tsx
index d7c0e521d..e0634dc28 100644
--- a/frontend/src/pages/organization/Organization.tsx
+++ b/frontend/src/pages/organization/Organization.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
 import { Outlet, useLocation, useNavigate, useParams } from 'react-router-dom';
 import { classNames } from '../../common/helpers/tailwind.helper';
 import { useErrorToast } from '../../common/hooks/useToast';
-import { useCountiesQuery } from '../../services/nomenclature/Nomenclature.queries';
+import { useCountiesQuery, useIssuersQuery } from '../../services/nomenclature/Nomenclature.queries';
 import {
   useOrganizationMutation,
   useOrganizationQuery,
@@ -28,6 +28,7 @@ const Organization = () => {
 
   // TODO: Load nomenclature data on app init
   useCountiesQuery();
+  useIssuersQuery();
 
   // load organization data
   const { error } = useOrganizationQuery(id as string);
diff --git a/frontend/src/pages/organization/OrganizationProfile.tsx b/frontend/src/pages/organization/OrganizationProfile.tsx
index 04679cde2..209be5778 100644
--- a/frontend/src/pages/organization/OrganizationProfile.tsx
+++ b/frontend/src/pages/organization/OrganizationProfile.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
 import { Outlet, useLocation, useNavigate } from 'react-router-dom';
 import { classNames } from '../../common/helpers/tailwind.helper';
 import { useErrorToast, useSuccessToast } from '../../common/hooks/useToast';
-import { useCountiesQuery } from '../../services/nomenclature/Nomenclature.queries';
+import { useCountiesQuery, useIssuersQuery } from '../../services/nomenclature/Nomenclature.queries';
 import {
   useOrganizationByProfileMutation,
   useOrganizationByProfileQuery,
@@ -32,6 +32,7 @@ const OrganizationProfile = () => {
 
   // TODO: Load nomenclature data on app init
   useCountiesQuery();
+  useIssuersQuery();
 
   const { isLoading, mutate: updateOrganization } = useOrganizationByProfileMutation();
 
diff --git a/frontend/src/pages/organization/components/OrganizationGeneral/OrganizationGeneral.tsx b/frontend/src/pages/organization/components/OrganizationGeneral/OrganizationGeneral.tsx
index 09c5270cd..bc4ce0c30 100644
--- a/frontend/src/pages/organization/components/OrganizationGeneral/OrganizationGeneral.tsx
+++ b/frontend/src/pages/organization/components/OrganizationGeneral/OrganizationGeneral.tsx
@@ -21,7 +21,7 @@ import SectionHeader from '../../../../components/section-header/SectionHeader';
 import Select from '../../../../components/Select/Select';
 import Textarea from '../../../../components/Textarea/Textarea';
 import { useAuthContext } from '../../../../contexts/AuthContext';
-import { useCitiesQuery } from '../../../../services/nomenclature/Nomenclature.queries';
+import { useCitiesQuery, useIssuersQuery } from '../../../../services/nomenclature/Nomenclature.queries';
 import { useNomenclature, useSelectedOrganization } from '../../../../store/selectors';
 import { UserRole } from '../../../users/enums/UserRole.enum';
 import { OrganizationContext } from '../../interfaces/OrganizationContext';
@@ -34,7 +34,7 @@ const OrganizationGeneral = () => {
   const [county, setCounty] = useState<any>();
   const [organizationCounty, setOrganizationCounty] = useState<any>();
   const [file, setFile] = useState<File | null>(null);
-  const { counties } = useNomenclature();
+  const { counties, issuers } = useNomenclature();
   const { disabled, updateOrganization } = useOutletContext<OrganizationContext>();
   const { role } = useAuthContext();
   const [validationErrors, setValidationErrors] = useState<string[]>([]);
@@ -145,6 +145,7 @@ const OrganizationGeneral = () => {
       countyId,
       organizationCountyId,
       organizationCityId,
+      associationRegistryIssuerId,
       ...organizationGeneralData
     } = data;
 
@@ -290,28 +291,115 @@ const OrganizationGeneral = () => {
                 }}
               />
               <Controller
-                key={OrganizationGeneralConfig.rafNumber.key}
-                name={OrganizationGeneralConfig.rafNumber.key}
-                rules={OrganizationGeneralConfig.rafNumber.rules}
+                key={OrganizationGeneralConfig.associationRegistryNumber.key}
+                name={OrganizationGeneralConfig.associationRegistryNumber.key}
+                rules={OrganizationGeneralConfig.associationRegistryNumber.rules}
                 control={control}
                 render={({ field: { onChange, value } }) => {
                   return (
                     <InputField
                       config={{
-                        ...OrganizationGeneralConfig.rafNumber.config,
-                        name: OrganizationGeneralConfig.rafNumber.key,
-                        error: errors[OrganizationGeneralConfig.rafNumber.key]?.message,
+                        ...OrganizationGeneralConfig.associationRegistryNumber.config,
+                        name: OrganizationGeneralConfig.associationRegistryNumber.key,
+                        error: errors[OrganizationGeneralConfig.associationRegistryNumber.key]?.message,
                         defaultValue: value,
                         onChange: onChange,
-                        id: 'organization-general__raf-no',
+                        id: 'organization-general__associationRegistryNumber',
                       }}
                       readonly={readonly}
-                      disabled={disabled}
                     />
                   );
                 }}
               />
 
+              <Controller
+                key={OrganizationGeneralConfig.associationRegistryPart.key}
+                name={OrganizationGeneralConfig.associationRegistryPart.key}
+                rules={OrganizationGeneralConfig.associationRegistryPart.rules}
+                control={control}
+                render={({ field: { onChange, value } }) => {
+                  return (
+                    <InputField
+                      config={{
+                        ...OrganizationGeneralConfig.associationRegistryPart.config,
+                        name: OrganizationGeneralConfig.associationRegistryPart.key,
+                        error: errors[OrganizationGeneralConfig.associationRegistryPart.key]?.message,
+                        defaultValue: value,
+                        onChange: onChange,
+                        id: 'organization-general__associationRegistryPart',
+                      }}
+                      readonly={readonly}
+                    />
+                  );
+                }}
+              />
+
+              <Controller
+                key={OrganizationGeneralConfig.associationRegistrySection.key}
+                name={OrganizationGeneralConfig.associationRegistrySection.key}
+                rules={OrganizationGeneralConfig.associationRegistrySection.rules}
+                control={control}
+                render={({ field: { onChange, value } }) => {
+                  return (
+                    <InputField
+                      config={{
+                        ...OrganizationGeneralConfig.associationRegistrySection.config,
+                        name: OrganizationGeneralConfig.associationRegistrySection.key,
+                        error: errors[OrganizationGeneralConfig.associationRegistrySection.key]?.message,
+                        defaultValue: value,
+                        onChange: onChange,
+                        id: 'organization-general__associationRegistrySection',
+                      }}
+                      readonly={readonly}
+                    />
+                  );
+                }}
+              />
+
+              <Controller
+                key={OrganizationGeneralConfig.associationRegistryIssuer.key}
+                name={OrganizationGeneralConfig.associationRegistryIssuer.key}
+                rules={OrganizationGeneralConfig.associationRegistryIssuer.rules}
+                control={control}
+                render={({ field: { onChange, value } }) => {
+                  return (
+                    <Select
+                      config={{
+                        ...OrganizationGeneralConfig.associationRegistryIssuer.config,
+                        collection: issuers,
+                        displayedAttribute: 'name',
+                        id: 'organization-general__associationRegistryIssuer',
+                      }}
+                      error={errors[OrganizationGeneralConfig.associationRegistryIssuer.key]?.message}
+                      selected={value}
+                      onChange={onChange}
+                      readonly={readonly}
+                    />
+                  );
+                }}
+              />
+
+              <Controller
+                key={OrganizationGeneralConfig.nationalRegistryNumber.key}
+                name={OrganizationGeneralConfig.nationalRegistryNumber.key}
+                rules={OrganizationGeneralConfig.nationalRegistryNumber.rules}
+                control={control}
+                render={({ field: { onChange, value } }) => {
+                  return (
+                    <InputField
+                      config={{
+                        ...OrganizationGeneralConfig.nationalRegistryNumber.config,
+                        name: OrganizationGeneralConfig.nationalRegistryNumber.key,
+                        error: errors[OrganizationGeneralConfig.nationalRegistryNumber.key]?.message,
+                        defaultValue: value,
+                        onChange: onChange,
+                        id: 'organization-general__nationalRegistryNumberr',
+                      }}
+                      readonly={readonly}
+                    />
+                  );
+                }}
+              />
               <Controller
                 key={OrganizationGeneralConfig.address.key}
                 name={OrganizationGeneralConfig.address.key}
@@ -571,7 +659,6 @@ const OrganizationGeneral = () => {
                   name={OrganizationGeneralConfig.hasSameAddress.key}
                   control={control}
                   render={({ field: { onChange, value } }) => {
-                    console.log(value);
                     return (
                       <InputField
                         config={{
diff --git a/frontend/src/pages/organization/components/OrganizationGeneral/OrganizationGeneralConfig.ts b/frontend/src/pages/organization/components/OrganizationGeneral/OrganizationGeneralConfig.ts
index d8a1c3f07..6e3517173 100644
--- a/frontend/src/pages/organization/components/OrganizationGeneral/OrganizationGeneralConfig.ts
+++ b/frontend/src/pages/organization/components/OrganizationGeneral/OrganizationGeneralConfig.ts
@@ -71,6 +71,44 @@ const translations = {
     label: i18n.t('general:config.raf.label'),
     placeholder: i18n.t('general:config.raf.placeholder'),
   },
+  associationRegistryNumber: {
+    required: i18n.t('general:config.association_registry_number.required'),
+    max: i18n.t('general:config.association_registry_number.max'),
+    label: i18n.t('general:config.association_registry_number.label'),
+    helper: i18n.t('general:config.association_registry_number.helper'),
+    placeholder: i18n.t('general:config.association_registry_number.placeholder'),
+  },
+  associationRegistryPart: {
+    max: i18n.t('general:config.association_registry_part.max'),
+    label: i18n.t('general:config.association_registry_part.label'),
+    required: i18n.t('general:config.association_registry_part.required'),
+    helper: i18n.t('general:config.association_registry_part.helper'),
+    placeholder: i18n.t('general:config.association_registry_part.placeholder'),
+  },
+
+  associationRegistrySection: {
+    max: i18n.t('general:config.association_registry_section.max'),
+    label: i18n.t('general:config.association_registry_section.label'),
+    required: i18n.t('general:config.association_registry_section.required'),
+    helper: i18n.t('general:config.association_registry_section.helper'),
+    placeholder: i18n.t('general:config.association_registry_section.placeholder'),
+  },
+
+  associationRegistryIssuer: {
+    max: i18n.t('general:config.association_registry_issuer.max'),
+    label: i18n.t('general:config.association_registry_issuer.label'),
+    required: i18n.t('general:config.association_registry_issuer.required'),
+    helper: i18n.t('general:config.association_registry_issuer.helper'),
+    placeholder: i18n.t('general:config.association_registry_issuer.placeholder'),
+  },
+  nationalRegistryNumber: {
+    max: i18n.t('general:config.national_registry_number.max'),
+    label: i18n.t('general:config.national_registry_number.label'),
+    required: i18n.t('general:config.national_registry_number.required'),
+    helper: i18n.t('general:config.national_registry_number.helper'),
+    placeholder: i18n.t('general:config.national_registry_number.placeholder'),
+  },
+
   city: {
     required: i18n.t('general:config.city.required'),
     label: i18n.t('general:config.city.label'),
@@ -340,6 +378,101 @@ export const OrganizationGeneralConfig: Record<string, any> = {
       placeholder: '',
     },
   },
+  associationRegistryNumber: {
+    key: 'associationRegistryNumber',
+    rules: {
+      required: {
+        value: true,
+        message: translations.associationRegistryNumber.required,
+      },
+      maxLength: {
+        value: 30,
+        message: translations.associationRegistryNumber.max,
+      },
+    },
+    config: {
+      type: 'text',
+      label: translations.associationRegistryNumber.label,
+      helperText: translations.associationRegistryNumber.helper,
+      placeholder: translations.associationRegistryNumber.placeholder,
+    },
+  },
+  associationRegistryPart: {
+    key: 'associationRegistryPart',
+    rules: {
+      required: {
+        value: true,
+        message: translations.associationRegistryPart.required,
+      },
+      maxLength: {
+        value: 10,
+        message: translations.associationRegistryPart.max,
+      },
+    },
+    config: {
+      type: 'text',
+      label: translations.associationRegistryPart.label,
+      helperText: translations.associationRegistryPart.helper,
+      placeholder: translations.associationRegistryPart.placeholder,
+    },
+  },
+  associationRegistrySection: {
+    key: 'associationRegistrySection',
+    rules: {
+      required: {
+        value: true,
+        message: translations.associationRegistrySection.required,
+      },
+      maxLength: {
+        value: 10,
+        message: translations.associationRegistrySection.max,
+      },
+    },
+    config: {
+      type: 'text',
+      label: translations.associationRegistrySection.label,
+      helperText: translations.associationRegistrySection.helper,
+      placeholder: translations.associationRegistrySection.placeholder,
+    },
+  },
+  associationRegistryIssuer: {
+    key: 'associationRegistryIssuer',
+    rules: {
+      required: {
+        value: true,
+        message: translations.associationRegistryIssuer.required,
+      },
+      maxLength: {
+        value: 100,
+        message: translations.associationRegistryIssuer.max,
+      },
+    },
+    config: {
+      type: 'text',
+      label: translations.associationRegistryIssuer.label,
+      helperText: translations.associationRegistryIssuer.helper,
+      placeholder: translations.associationRegistryIssuer.placeholder,
+    },
+  },
+  nationalRegistryNumber: {
+    key: 'nationalRegistryNumber',
+    rules: {
+      required: {
+        value: true,
+        message: translations.nationalRegistryNumber.required,
+      },
+      maxLength: {
+        value: 30,
+        message: translations.nationalRegistryNumber.max,
+      },
+    },
+    config: {
+      type: 'text',
+      label: translations.nationalRegistryNumber.label,
+      helperText: translations.nationalRegistryNumber.helper,
+      placeholder: translations.nationalRegistryNumber.placeholder,
+    },
+  },
   rafNumber: {
     key: 'rafNumber',
     rules: {
diff --git a/frontend/src/pages/organization/components/OrganizationLegal/OrganizationLegal.tsx b/frontend/src/pages/organization/components/OrganizationLegal/OrganizationLegal.tsx
index a2edc36af..5babb64cc 100644
--- a/frontend/src/pages/organization/components/OrganizationLegal/OrganizationLegal.tsx
+++ b/frontend/src/pages/organization/components/OrganizationLegal/OrganizationLegal.tsx
@@ -18,7 +18,7 @@ import PopoverMenu, { PopoverMenuRowType } from '../../../../components/popover-
 import SectionHeader from '../../../../components/section-header/SectionHeader';
 import Spinner from '../../../../components/spinner/Spinner';
 import { AuthContext } from '../../../../contexts/AuthContext';
-import { useDeleteOrganizationStatuteMutation } from '../../../../services/organization/Organization.queries';
+import { useDeleteBalanceSheetFileMutation, useDeleteNonPoliticalAffiliationFileMutation, useDeleteOrganizationStatuteMutation } from '../../../../services/organization/Organization.queries';
 import { useSelectedOrganization } from '../../../../store/selectors';
 import { UserRole } from '../../../users/enums/UserRole.enum';
 import { Contact } from '../../interfaces/Contact.interface';
@@ -32,6 +32,8 @@ import { OthersTableHeaders } from './table-headers/OthersTable.headers';
 const OrganizationLegal = () => {
   const [isEditMode, setEditMode] = useState(false);
   const [organizationStatute, setOrganizationStatute] = useState<File | null>(null);
+  const [nonPoliticalAffiliationFile, setNonPoliticalAffiliationFile] = useState<File | null>(null);
+  const [balanceSheetFile, setBalanceSheetFile] = useState<File | null>(null);
   // directors
   const [directors, setDirectors] = useState<Partial<Contact>[]>([]);
   const [directorsDeleted, setDirectorsDeleted] = useState<number[]>([]);
@@ -44,14 +46,28 @@ const OrganizationLegal = () => {
   const [isDeleteOtheModalOpen, setIsDeleteOtherModalOpen] = useState<boolean>(false);
   const [isDeleteOrganizationStatuteModalOpen, setDeleteOrganizationStatuteModalOpen] =
     useState<boolean>(false);
+
+  const [isDeleteNonPoliticalAffiliationFileModalOpen, setDeleteNonPoliticalAffiliationFileModalOpen] =
+    useState<boolean>(false);
+
+  const [isDeleteBalanceSheetFileModalOpen, setDeleteBalanceSheetFileModalOpen] =
+    useState<boolean>(false);
+
   const [selectedOther, setSelectedOther] = useState<Partial<Person> | null>(null);
   // queries
   const { organizationLegal, organization } = useSelectedOrganization();
   const { updateOrganization, isLoading: isLoadingUpdateOrganization } =
     useOutletContext<OrganizationContext>();
+
+
   const { mutate: deleteOrganizationStatute, isLoading: isRemovingOrganizationStatute } =
     useDeleteOrganizationStatuteMutation();
 
+  const { mutate: deleteNonPoliticalAffiliationFile, isLoading: isRemovingNonPoliticalAffiliationFile } =
+    useDeleteNonPoliticalAffiliationFileMutation();
+
+  const { mutateAsync: deleteBalanceSheetFile, isLoading: isRemovingBalanceSheetFile } = useDeleteBalanceSheetFileMutation()
+
   const { role } = useContext(AuthContext);
   // React i18n
   const { t } = useTranslation(['legal', 'organization', 'common']);
@@ -174,6 +190,18 @@ const OrganizationLegal = () => {
     setDeleteOrganizationStatuteModalOpen(true);
   };
 
+  const onDeleteNonPoliticalAffiliationFile = (event: any) => {
+    event.stopPropagation();
+    event.preventDefault();
+    setDeleteNonPoliticalAffiliationFileModalOpen(true);
+  };
+
+  const onDeleteBalanceSheetFile = (event: any) => {
+    event.stopPropagation();
+    event.preventDefault();
+    setDeleteBalanceSheetFileModalOpen(true);
+  };
+
   const onOpenDeleteOtherModal = (row: Person) => {
     setSelectedOther(row);
     setIsDeleteOtherModalOpen(true);
@@ -219,6 +247,7 @@ const OrganizationLegal = () => {
       fullName: data.legalReprezentative_fullName,
       phone: data.legalReprezentative_phone,
       email: data.legalReprezentative_email,
+      role: data.legalReprezentative_role,
     };
 
     updateOrganization(
@@ -227,10 +256,14 @@ const OrganizationLegal = () => {
         organization: { legal: { legalReprezentative, directors, directorsDeleted, others } },
         logo: null,
         organizationStatute,
+        nonPoliticalAffiliationFile,
+        balanceSheetFile
       },
       {
         onSuccess: () => {
           setOrganizationStatute(null);
+          setNonPoliticalAffiliationFile(null);
+          setBalanceSheetFile(null);
           setEditMode(false);
         },
         onError: (error: any) => {
@@ -239,6 +272,8 @@ const OrganizationLegal = () => {
           if (err.code) {
             useErrorToast(FILE_ERRORS[err.code]);
             setOrganizationStatute(null);
+            setNonPoliticalAffiliationFile(null);
+            setBalanceSheetFile(null);
           } else {
             useErrorToast(t('save_error', { ns: 'organization' }));
           }
@@ -247,7 +282,7 @@ const OrganizationLegal = () => {
     );
   };
 
-  const onChangeFile = (event: React.ChangeEvent<HTMLInputElement>) => {
+  const onChangeStatuteFile = (event: React.ChangeEvent<HTMLInputElement>) => {
     if (event.target.files && event.target.files.length > 0) {
       setOrganizationStatute(event.target.files[0]);
       event.target.value = '';
@@ -256,6 +291,25 @@ const OrganizationLegal = () => {
     }
   };
 
+  const onChangeNonPoliticalAffiliationFile = (event: React.ChangeEvent<HTMLInputElement>) => {
+    if (event.target.files && event.target.files.length > 0) {
+      setNonPoliticalAffiliationFile(event.target.files[0]);
+      event.target.value = '';
+    } else {
+      event.target.value = '';
+    }
+  };
+
+
+  const onChangeBalanceSheetFile = (event: React.ChangeEvent<HTMLInputElement>) => {
+    if (event.target.files && event.target.files.length > 0) {
+      setBalanceSheetFile(event.target.files[0]);
+      event.target.value = '';
+    } else {
+      event.target.value = '';
+    }
+  };
+
   const onRemoveOrganizationStatute = () => {
     // 1. check if we have a path in s3 and remove it
     if (organizationLegal?.organizationStatute) {
@@ -278,6 +332,50 @@ const OrganizationLegal = () => {
     }
   };
 
+  const onRemoveNonPoliticalAffiliationFile = () => {
+    // 1. check if we have a path in s3 and remove it
+    if (organizationLegal?.nonPoliticalAffiliationFile) {
+      deleteNonPoliticalAffiliationFile(
+        { organizationId: organization?.id as number },
+        {
+          onError: (error: any) => {
+            useErrorToast(FILE_ERRORS[error?.response.data.code]);
+          },
+          onSettled: () => {
+            setNonPoliticalAffiliationFile(null);
+            setDeleteNonPoliticalAffiliationFileModalOpen(false);
+          },
+        },
+      );
+    } else {
+      // 2. the file is only in memory so we clear state
+      setNonPoliticalAffiliationFile(null);
+      setDeleteNonPoliticalAffiliationFileModalOpen(false);
+    }
+  };
+
+  const onRemoveBalanceSheetFile = () => {
+    // 1. check if we have a path in s3 and remove it
+    if (organizationLegal?.balanceSheetFile) {
+      deleteBalanceSheetFile(
+        { organizationId: organization?.id as number },
+        {
+          onError: (error: any) => {
+            useErrorToast(FILE_ERRORS[error?.response.data.code]);
+          },
+          onSettled: () => {
+            setBalanceSheetFile(null);
+            setDeleteBalanceSheetFileModalOpen(false);
+          },
+        },
+      );
+    } else {
+      // 2. the file is only in memory so we clear state
+      setBalanceSheetFile(null);
+      setDeleteBalanceSheetFileModalOpen(false);
+    }
+  };
+
   return (
     <div className="w-full bg-white shadow rounded-lg">
       <div className="py-5 lg:px-10 px-5 flex justify-between items-center">
@@ -296,8 +394,8 @@ const OrganizationLegal = () => {
               !isEditMode
                 ? setEditMode.bind(null, true)
                 : () => {
-                    handleSubmit(handleSave)();
-                  }
+                  handleSubmit(handleSave)();
+                }
             }
           >
             {isLoadingUpdateOrganization ? (
@@ -330,6 +428,7 @@ const OrganizationLegal = () => {
                   OrganizationLegalConfig.legal_reprezentative_name,
                   OrganizationLegalConfig.legal_reprezentative_email,
                   OrganizationLegalConfig.legal_reprezentative_phone,
+                  OrganizationLegalConfig.legal_reprezentative_role,
                 ]}
               />
             </form>
@@ -382,10 +481,17 @@ const OrganizationLegal = () => {
               </button>
             )}
           </section>
+          {
+            // Statute section
+          }
           <section className="flex flex-col gap-6 w-full pt-8">
             <SectionHeader title={t('statute')} subTitle={t('statute_information')} />
             <div className="flex flex-col gap-y-4">
-              <h3>{t('document')}</h3>
+              {!organizationLegal?.organizationStatute &&
+                organizationStatute === null && (
+                  <h3>{t('no_document')}</h3>
+                )
+              }
               {isEditMode &&
                 !organizationLegal?.organizationStatute &&
                 organizationStatute === null && (
@@ -402,7 +508,7 @@ const OrganizationLegal = () => {
                       id="uploadStatute"
                       type="file"
                       accept={FILE_TYPES_ACCEPT.STATUTE}
-                      onChange={onChangeFile}
+                      onChange={onChangeStatuteFile}
                     />
                     {!organizationStatute && isSubmitted && (
                       <p
@@ -431,6 +537,100 @@ const OrganizationLegal = () => {
               )}
             </div>
           </section>
+
+          {
+            // Political Affiliation section
+          }
+          <section className="flex flex-col gap-6 w-full pt-8">
+            <SectionHeader title={t('non_political_affiliation')} subTitle={t('non_political_affiliation_information')} />
+            <div className="flex flex-col gap-y-4">
+              {!organizationLegal?.nonPoliticalAffiliationFile &&
+                nonPoliticalAffiliationFile === null && (
+                  <h3>{t('non_political_affiliation_no_document')}</h3>
+                )}
+              {isEditMode &&
+                !organizationLegal?.nonPoliticalAffiliationFile &&
+                nonPoliticalAffiliationFile === null && (
+                  <div className="flex flex-col gap-y-1">
+                    <label
+                      htmlFor="uploadNonPoliticalAffiliationFile"
+                      className="w-32 cursor-pointer bg-white py-2 px-3 border border-gray-300 rounded-md shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
+                    >
+                      {t('non_political_affiliation_upload')}
+                    </label>
+                    <input
+                      className="h-0 w-0"
+                      name="uploadNonPoliticalAffiliationFile"
+                      id="uploadNonPoliticalAffiliationFile"
+                      type="file"
+                      accept={FILE_TYPES_ACCEPT.NON_POLITICAL_AFFILIATION}
+                      onChange={onChangeNonPoliticalAffiliationFile}
+                    />
+                  </div>
+                )}
+              {(organizationLegal?.nonPoliticalAffiliationFile || nonPoliticalAffiliationFile) && (
+                <a
+                  aria-label={t('')}
+                  href={fileToURL(nonPoliticalAffiliationFile) || organizationLegal?.nonPoliticalAffiliationFile}
+                  download
+                  className="text-indigo-600 font-medium text-sm flex items-center"
+                >
+                  <PaperClipIcon className=" w-4 h-4 text-gray-600" />
+                  {t('non_political_affiliation_file_name')}
+                  {isEditMode && !isRemovingNonPoliticalAffiliationFile && (
+                    <XMarkIcon className="ml-2 w-4 h-4 text-gray-600" onClick={onDeleteNonPoliticalAffiliationFile} />
+                  )}
+                  {isRemovingNonPoliticalAffiliationFile && <Spinner className="w-4 h-4 ml-2" />}
+                </a>
+              )}
+            </div>
+          </section>
+
+          {/* Balance Sheet File */}
+          <section className="flex flex-col gap-6 w-full pt-8">
+            <SectionHeader title={t('balance_sheet')} subTitle={t('balance_sheet_information')} />
+            <div className="flex flex-col gap-y-4">
+              {!organizationLegal?.balanceSheetFile &&
+                balanceSheetFile === null && (
+                  <h3>{t('balance_sheet_no_document')}</h3>
+                )}
+              {isEditMode &&
+                !organizationLegal?.balanceSheetFile &&
+                balanceSheetFile === null && (
+                  <div className="flex flex-col gap-y-1">
+                    <label
+                      htmlFor="uploadBalanceSheet"
+                      className="w-32 cursor-pointer bg-white py-2 px-3 border border-gray-300 rounded-md shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
+                    >
+                      {t('balance_sheet_upload')}
+                    </label>
+                    <input
+                      className="h-0 w-0"
+                      name="uploadBalanceSheet"
+                      id="uploadBalanceSheet"
+                      type="file"
+                      accept={FILE_TYPES_ACCEPT.BALANCE_SHEET}
+                      onChange={onChangeBalanceSheetFile}
+                    />
+                  </div>
+                )}
+              {(organizationLegal?.balanceSheetFile || balanceSheetFile) && (
+                <a
+                  aria-label={t('')}
+                  href={fileToURL(balanceSheetFile) || organizationLegal?.balanceSheetFile}
+                  download
+                  className="text-indigo-600 font-medium text-sm flex items-center"
+                >
+                  <PaperClipIcon className=" w-4 h-4 text-gray-600" />
+                  {t('balance_sheet_file_name')}
+                  {isEditMode && !isRemovingBalanceSheetFile && (
+                    <XMarkIcon className="ml-2 w-4 h-4 text-gray-600" onClick={onDeleteBalanceSheetFile} />
+                  )}
+                  {isRemovingBalanceSheetFile && <Spinner className="w-4 h-4 ml-2" />}
+                </a>
+              )}
+            </div>
+          </section>
           {isDirectorModalOpen && (
             <DirectorModal
               isEdit={selectedDirector !== null}
@@ -491,6 +691,31 @@ const OrganizationLegal = () => {
               onConfirm={onRemoveOrganizationStatute}
             />
           )}
+          {isDeleteNonPoliticalAffiliationFileModalOpen && (
+            <ConfirmationModal
+              title={t('delete_non_politicial_affiliation_modal.title')}
+              description={t('delete_non_politicial_affiliation_modal.description')}
+              closeBtnLabel={t('back', { ns: 'common' })}
+              confirmBtnLabel={t('delete', { ns: 'common' })}
+              onClose={() => {
+                setDeleteNonPoliticalAffiliationFileModalOpen(false);
+              }}
+              onConfirm={onRemoveNonPoliticalAffiliationFile}
+            />
+          )}
+
+          {isDeleteBalanceSheetFileModalOpen && (
+            <ConfirmationModal
+              title={t('delete_balance_sheet_modal.title')}
+              description={t('delete_balance_sheet_modal.description')}
+              closeBtnLabel={t('back', { ns: 'common' })}
+              confirmBtnLabel={t('delete', { ns: 'common' })}
+              onClose={() => {
+                setDeleteBalanceSheetFileModalOpen(false);
+              }}
+              onConfirm={onRemoveBalanceSheetFile}
+            />
+          )}
         </div>
       </div>
     </div>
diff --git a/frontend/src/pages/organization/components/OrganizationLegal/OrganizationLegalConfig.ts b/frontend/src/pages/organization/components/OrganizationLegal/OrganizationLegalConfig.ts
index ed51b1e98..982af466d 100644
--- a/frontend/src/pages/organization/components/OrganizationLegal/OrganizationLegalConfig.ts
+++ b/frontend/src/pages/organization/components/OrganizationLegal/OrganizationLegalConfig.ts
@@ -23,6 +23,10 @@ const translations = {
     invalid: i18n.t('legal:legal_config.phone.invalid'),
     phone: i18n.t('legal:legal_config.phone.label'),
   },
+  role: {
+    maxim: i18n.t('legal:legal_config.role.maxim'),
+    role: i18n.t('legal:legal_config.role.label'),
+  },
 };
 
 export const OrganizationLegalConfig: Record<string, any> = {
@@ -98,4 +102,19 @@ export const OrganizationLegalConfig: Record<string, any> = {
       placeholder: '',
     },
   },
+  legal_reprezentative_role: {
+    key: 'legalReprezentative_role',
+    rules: {
+      maxLength: {
+        value: 50,
+        message: translations.role.maxim,
+      },
+    },
+    config: {
+      type: 'text',
+      label: translations.role.role,
+      helperText: '',
+      placeholder: 'Administrator',
+    },
+  },
 };
diff --git a/frontend/src/pages/organization/components/OrganizationLegal/components/DirectorConfig.ts b/frontend/src/pages/organization/components/OrganizationLegal/components/DirectorConfig.ts
index 0ead5d0f6..092d88e87 100644
--- a/frontend/src/pages/organization/components/OrganizationLegal/components/DirectorConfig.ts
+++ b/frontend/src/pages/organization/components/OrganizationLegal/components/DirectorConfig.ts
@@ -23,6 +23,10 @@ const translations = {
     invalid: i18n.t('legal:director_config.phone.invalid'),
     phone: i18n.t('legal:director_config.phone.label'),
   },
+  role: {
+    maxim: i18n.t('legal:director_config.role.maxim'),
+    role: i18n.t('legal:director_config.role.label'),
+  },
 };
 
 export const DirectorConfig: Record<string, any> = {
@@ -98,4 +102,19 @@ export const DirectorConfig: Record<string, any> = {
       placeholder: '0721111111',
     },
   },
+  role: {
+    key: 'role',
+    rules: {
+      maxLength: {
+        value: 50,
+        message: translations.phone.maxim,
+      },
+    },
+    config: {
+      type: 'text',
+      label: i18n.t('legal:director_config.role.label'),
+      helperText: '',
+      placeholder: 'Administrator',
+    },
+  },
 };
diff --git a/frontend/src/pages/organization/components/OrganizationLegal/components/DirectorModal.tsx b/frontend/src/pages/organization/components/OrganizationLegal/components/DirectorModal.tsx
index d57f7e2e6..7af926ddd 100644
--- a/frontend/src/pages/organization/components/OrganizationLegal/components/DirectorModal.tsx
+++ b/frontend/src/pages/organization/components/OrganizationLegal/components/DirectorModal.tsx
@@ -92,7 +92,7 @@ const DirectorModal = ({ isEdit, onClose, defaultValue, onSave, id }: DirectorMo
                     control={control}
                     errors={errors}
                     readonly={false}
-                    configs={[DirectorConfig.fullName, DirectorConfig.email, DirectorConfig.phone]}
+                    configs={[DirectorConfig.fullName, DirectorConfig.email, DirectorConfig.phone, DirectorConfig.role]}
                     id={id}
                   />
                 </form>
diff --git a/frontend/src/pages/organization/components/OrganizationLegal/table-headers/DirectorsTable.headers.tsx b/frontend/src/pages/organization/components/OrganizationLegal/table-headers/DirectorsTable.headers.tsx
index 418ffa984..78d41e7c2 100644
--- a/frontend/src/pages/organization/components/OrganizationLegal/table-headers/DirectorsTable.headers.tsx
+++ b/frontend/src/pages/organization/components/OrganizationLegal/table-headers/DirectorsTable.headers.tsx
@@ -8,6 +8,7 @@ const translations = {
   name: i18n.t('legal:header.name'),
   email: i18n.t('legal:header.email'),
   phone: i18n.t('legal:header.phone'),
+  role: i18n.t('legal:header.role'),
 };
 
 export const DirectorsTableHeaders: TableColumn<Contact>[] = [
@@ -35,4 +36,12 @@ export const DirectorsTableHeaders: TableColumn<Contact>[] = [
     minWidth: '10rem',
     sortable: true,
   },
+  {
+    id: 'role',
+    name: <DataTableNameHeader text={translations.role} />,
+    selector: (row: Contact) => row.role,
+    grow: 1,
+    minWidth: '10rem',
+    sortable: true,
+  },
 ];
diff --git a/frontend/src/pages/organization/interfaces/Contact.interface.ts b/frontend/src/pages/organization/interfaces/Contact.interface.ts
index 0816a8587..bcd8c80f9 100644
--- a/frontend/src/pages/organization/interfaces/Contact.interface.ts
+++ b/frontend/src/pages/organization/interfaces/Contact.interface.ts
@@ -4,4 +4,5 @@ export interface Contact extends BaseEntity {
   fullName: string;
   email: string;
   phone: string;
+  role: string;
 }
diff --git a/frontend/src/pages/organization/interfaces/OrganizationGeneral.interface.ts b/frontend/src/pages/organization/interfaces/OrganizationGeneral.interface.ts
index 0b4d1f363..7d441c4cd 100644
--- a/frontend/src/pages/organization/interfaces/OrganizationGeneral.interface.ts
+++ b/frontend/src/pages/organization/interfaces/OrganizationGeneral.interface.ts
@@ -13,7 +13,11 @@ export interface IOrganizationGeneral extends BaseEntity {
   phone: string;
   yearCreated: number;
   cui: string;
-  rafNumber: string;
+  associationRegistryNumber: string;
+  associationRegistryPart: string;
+  associationRegistrySection: string;
+  associationRegistryIssuerId: number;
+  nationalRegistryNumber: string;
   shortDescription: string;
   description: string;
   logo?: string;
diff --git a/frontend/src/pages/organization/interfaces/OrganizationLegal.interface.ts b/frontend/src/pages/organization/interfaces/OrganizationLegal.interface.ts
index f90c529d5..ccf7d4fe0 100644
--- a/frontend/src/pages/organization/interfaces/OrganizationLegal.interface.ts
+++ b/frontend/src/pages/organization/interfaces/OrganizationLegal.interface.ts
@@ -7,4 +7,6 @@ export interface IOrganizationLegal extends BaseEntity {
   directors: Contact[];
   others: Person[];
   organizationStatute?: string;
+  nonPoliticalAffiliationFile?: string;
+  balanceSheetFile?: string;
 }
diff --git a/frontend/src/pages/requests/components/Request.tsx b/frontend/src/pages/requests/components/Request.tsx
index ace8eaa82..1d9f1e321 100644
--- a/frontend/src/pages/requests/components/Request.tsx
+++ b/frontend/src/pages/requests/components/Request.tsx
@@ -9,7 +9,7 @@ import { IPageTab } from '../../../common/interfaces/tabs.interface';
 import ConfirmationModal from '../../../components/confim-removal-modal/ConfirmationModal';
 import ContentWrapper from '../../../components/content-wrapper/ContentWrapper';
 import { Loading } from '../../../components/loading/Loading';
-import { useCountiesQuery } from '../../../services/nomenclature/Nomenclature.queries';
+import { useCountiesQuery, useIssuersQuery } from '../../../services/nomenclature/Nomenclature.queries';
 import {
   useApproveOrganizationRequestMutation,
   useRejectOrganizationRequestMutation,
@@ -38,6 +38,7 @@ const Request = () => {
 
   // TODO: Load nomenclature data on app init
   useCountiesQuery();
+  useIssuersQuery();
 
   // load organization data
   const { data: request, error, isLoading: dataLoading } = useOrganizationRequest(id || '');
diff --git a/frontend/src/pages/users/components/UserInvites/UserInvites.tsx b/frontend/src/pages/users/components/UserInvites/UserInvites.tsx
index 503c9299d..5e5ae617f 100644
--- a/frontend/src/pages/users/components/UserInvites/UserInvites.tsx
+++ b/frontend/src/pages/users/components/UserInvites/UserInvites.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { SortOrder, TableColumn } from 'react-data-table-component';
 import DataTableFilters from '../../../../components/data-table-filters/DataTableFilters';
 import DataTableComponent from '../../../../components/data-table/DataTableComponent';
@@ -10,13 +10,18 @@ import {
   useResendInviteMutation,
 } from '../../../../services/user/User.queries';
 import { useUser } from '../../../../store/selectors';
-import { UserInvitesTableHeaders } from './table-headers/UserInvitesTable.headers';
+import {
+  UserInvitesTableHeaderSuperAdmin,
+  UserInvitesTableHeaders,
+} from './table-headers/UserInvitesTable.headers';
 import { useTranslation } from 'react-i18next';
 import { ArrowUturnLeftIcon, TrashIcon } from '@heroicons/react/24/outline';
 import { useErrorToast, useSuccessToast } from '../../../../common/hooks/useToast';
 import ConfirmationModal from '../../../../components/confim-removal-modal/ConfirmationModal';
 import { IInvite } from '../../interfaces/Invite.interface';
 import { OrderDirection } from '../../../../common/enums/sort-direction.enum';
+import { useAuthContext } from '../../../../contexts/AuthContext';
+import { UserRole } from '../../enums/UserRole.enum';
 
 const UserInvites = () => {
   const [isConfirmRemoveModalOpen, setIsConfirmRemoveModalOpen] = useState<boolean>(false);
@@ -28,6 +33,7 @@ const UserInvites = () => {
   const [orderByColumn, setOrderByColumn] = useState<string>();
   const [orderDirection, setOrderDirection] = useState<OrderDirection>();
 
+  const { role } = useAuthContext();
   const { invites } = useUser();
 
   const { t } = useTranslation(['user', 'common']);
@@ -53,6 +59,14 @@ const UserInvites = () => {
     if (selectedInviteeForDeletion) setIsConfirmRemoveModalOpen(true);
   }, [selectedInviteeForDeletion]);
 
+  const ListTableHeader = useMemo(() => {
+    if (role === UserRole.SUPER_ADMIN) {
+      return [...UserInvitesTableHeaderSuperAdmin, ...UserInvitesTableHeaders];
+    }
+
+    return UserInvitesTableHeaders;
+  }, [role]);
+
   const buildUserActionColumn = (): TableColumn<IInvite> => {
     const pendingUserMenuItems = [
       {
@@ -164,7 +178,7 @@ const UserInvites = () => {
           </button> */}
         </div>
         <DataTableComponent
-          columns={[...UserInvitesTableHeaders, buildUserActionColumn()]}
+          columns={[...ListTableHeader, buildUserActionColumn()]}
           data={invites}
           loading={isLoading}
           sortServer
diff --git a/frontend/src/pages/users/components/UserInvites/table-headers/UserInvitesTable.headers.tsx b/frontend/src/pages/users/components/UserInvites/table-headers/UserInvitesTable.headers.tsx
index 45a160e21..82038ae48 100644
--- a/frontend/src/pages/users/components/UserInvites/table-headers/UserInvitesTable.headers.tsx
+++ b/frontend/src/pages/users/components/UserInvites/table-headers/UserInvitesTable.headers.tsx
@@ -10,6 +10,8 @@ const translations = {
   email: i18n.t('user:invites_header.email'),
   phone: i18n.t('user:invites_header.phone'),
   added_on: i18n.t('user:invites_header.added_on'),
+  organizationAlias: i18n.t('user:invites_header.organizationAlias'),
+  role: i18n.t('user:invites_header.role'),
 };
 
 export const UserInvitesTableHeaders: TableColumn<IInvite>[] = [
@@ -42,3 +44,24 @@ export const UserInvitesTableHeaders: TableColumn<IInvite>[] = [
     selector: (row: IInvite) => formatDate(row?.createdOn),
   },
 ];
+
+export const UserInvitesTableHeaderSuperAdmin: TableColumn<IInvite>[] = [
+  {
+    id: 'organization.organizationGeneral.alias',
+    name: <DataTableNameHeader text={translations.organizationAlias} />,
+    sortable: true,
+    grow: 1,
+    wrap: false,
+    minWidth: '15rem',
+    selector: (row: IInvite) => row.organization.organizationGeneral.alias,
+  },
+  {
+    id: 'role',
+    name: <DataTableNameHeader text={translations.role} />,
+    sortable: true,
+    grow: 1,
+    wrap: false,
+    minWidth: '10rem',
+    selector: (row: IInvite) => row.role,
+  },
+];
diff --git a/frontend/src/pages/users/components/UserList/UserList.tsx b/frontend/src/pages/users/components/UserList/UserList.tsx
index 04ed0baa9..a14f374a4 100644
--- a/frontend/src/pages/users/components/UserList/UserList.tsx
+++ b/frontend/src/pages/users/components/UserList/UserList.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { NoSymbolIcon } from '@heroicons/react/24/outline';
 import { PencilIcon, ArrowPathIcon, TrashIcon } from '@heroicons/react/24/solid';
 import { SortOrder, TableColumn } from 'react-data-table-component';
@@ -16,11 +16,14 @@ import {
   useRestrictUserMutation,
   useUsersQuery,
 } from '../../../../services/user/User.queries';
-import { useOngApplications, useUser } from '../../../../store/selectors';
+import { useUser } from '../../../../store/selectors';
 import { UserStatusOptions } from '../../constants/filters.constants';
 import { UserStatus } from '../../enums/UserStatus.enum';
-import { IUser } from '../../interfaces/User.interface';
-import { UserListTableHeaders } from './table-headers/UserListTable.headers';
+import { IUserWithApplications } from '../../interfaces/User.interface';
+import {
+  UserListTableHeaderOrganizationAlias,
+  UserListTableHeaders,
+} from './table-headers/UserListTable.headers';
 import { useNavigate } from 'react-router-dom';
 import ConfirmationModal from '../../../../components/confim-removal-modal/ConfirmationModal';
 import { useTranslation } from 'react-i18next';
@@ -35,7 +38,7 @@ import { ApplicationListItem } from '../../../../services/application/interfaces
 
 const UserList = (props: { organizationId?: number }) => {
   const navigate = useNavigate();
-  const [selectedUser, setSelectedUser] = useState<IUser | null>(null);
+  const [selectedUser, setSelectedUser] = useState<IUserWithApplications | null>(null);
   const [page, setPage] = useState<number>();
   const [rowsPerPage, setRowsPerPage] = useState<number>();
   const [orderByColumn, setOrderByColumn] = useState<string>();
@@ -98,7 +101,15 @@ const UserList = (props: { organizationId?: number }) => {
     removeUserMutation.error,
   ]);
 
-  const buildUserActionColumn = (): TableColumn<IUser> => {
+  const ListTableHeader = useMemo(() => {
+    if (role === UserRole.SUPER_ADMIN) {
+      return [UserListTableHeaderOrganizationAlias, ...UserListTableHeaders];
+    }
+
+    return UserListTableHeaders;
+  }, [role]);
+
+  const buildUserActionColumn = (): TableColumn<IUserWithApplications> => {
     const activeUserMenuItems = [
       {
         name: t('list.restrict'),
@@ -142,7 +153,7 @@ const UserList = (props: { organizationId?: number }) => {
 
     return {
       name: '',
-      cell: (row: IUser) => (
+      cell: (row: IUserWithApplications) => (
         <PopoverMenu
           row={row}
           menuItems={
@@ -178,7 +189,7 @@ const UserList = (props: { organizationId?: number }) => {
   /**
    * ROW ACTIONS
    */
-  const onRestoreAccess = (row: IUser) => {
+  const onRestoreAccess = (row: IUserWithApplications) => {
     restoreUserAccessMutation.mutate([row.id], {
       onSuccess: () => {
         useSuccessToast(`${t('list.restore_success')} ${row.name}`);
@@ -187,7 +198,7 @@ const UserList = (props: { organizationId?: number }) => {
     });
   };
 
-  const onEdit = (row: IUser) => {
+  const onEdit = (row: IUserWithApplications) => {
     navigate(`/user/${row.id}`);
   };
 
@@ -206,7 +217,7 @@ const UserList = (props: { organizationId?: number }) => {
     setIsConfirmRemoveModalOpen(false);
   };
 
-  const onRestrictAccess = (row: IUser) => {
+  const onRestrictAccess = (row: IUserWithApplications) => {
     restrictUserAccessMutation.mutate([row.id], {
       onSuccess: () => {
         useSuccessToast(`${t('list.restrict_success')} ${row.name}`);
@@ -326,7 +337,7 @@ const UserList = (props: { organizationId?: number }) => {
           </button>
         </div>
         <DataTableComponent
-          columns={[...UserListTableHeaders, buildUserActionColumn()]}
+          columns={[...ListTableHeader, buildUserActionColumn()]}
           data={users.items}
           loading={isLoading}
           pagination
diff --git a/frontend/src/pages/users/components/UserList/table-headers/UserListTable.headers.tsx b/frontend/src/pages/users/components/UserList/table-headers/UserListTable.headers.tsx
index 64bc46ecd..c67da341c 100644
--- a/frontend/src/pages/users/components/UserList/table-headers/UserListTable.headers.tsx
+++ b/frontend/src/pages/users/components/UserList/table-headers/UserListTable.headers.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { TableColumn } from 'react-data-table-component';
 import { formatDate } from '../../../../../common/helpers/format.helper';
 import StatusBadge, { BadgeStatus } from '../../../../../components/status-badge/StatusBadge';
-import { IUser } from '../../../interfaces/User.interface';
+import { IUserWithApplications } from '../../../interfaces/User.interface';
 import { UserStatus } from '../../../enums/UserStatus.enum';
 import i18n from '../../../../../common/config/i18n';
 import DataTableNameHeader from '../../../../../components/data-table-name-header/DataTableNameHeader';
@@ -15,9 +15,10 @@ const translations = {
   created: i18n.t('user:list_header.created'),
   active: i18n.t('user:status.active'),
   restricted: i18n.t('user:status.restricted'),
+  organizationAlias: i18n.t('user:list_header.organizationAlias'),
 };
 
-export const UserListTableHeaders: TableColumn<IUser>[] = [
+export const UserListTableHeaders: TableColumn<IUserWithApplications>[] = [
   {
     id: 'name',
     name: <DataTableNameHeader text={translations.name} />,
@@ -25,7 +26,7 @@ export const UserListTableHeaders: TableColumn<IUser>[] = [
     grow: 1,
     wrap: false,
     minWidth: '15rem',
-    selector: (row: IUser) => row.name,
+    selector: (row: IUserWithApplications) => row.name,
   },
   {
     id: 'email',
@@ -33,21 +34,21 @@ export const UserListTableHeaders: TableColumn<IUser>[] = [
     sortable: true,
     grow: 1,
     minWidth: '20rem',
-    selector: (row: IUser) => row.email,
+    selector: (row: IUserWithApplications) => row.email,
   },
   {
     id: 'phone',
     name: <DataTableNameHeader text={translations.phone} />,
     sortable: true,
     minWidth: '9rem',
-    selector: (row: IUser) => row.phone,
+    selector: (row: IUserWithApplications) => row.phone,
   },
   {
     id: 'availableApps',
     name: <DataTableNameHeader text="Access Aplicatii" />,
     sortable: false,
     minWidth: '15rem',
-    cell: (row: IUser) => (
+    cell: (row: IUserWithApplications) => (
       <div>
         {`(${row.availableApps.length})`}{' '}
         {row?.availableApps?.map((app, i) => (
@@ -62,7 +63,6 @@ export const UserListTableHeaders: TableColumn<IUser>[] = [
         ))}
       </div>
     ),
-    selector: (row: IUser) => row.availableAppsList || '',
   },
   {
     id: 'status',
@@ -70,7 +70,7 @@ export const UserListTableHeaders: TableColumn<IUser>[] = [
     sortField: 'status',
     name: <DataTableNameHeader text={translations.status} />,
     minWidth: '10rem',
-    cell: (row: IUser) => (
+    cell: (row: IUserWithApplications) => (
       <StatusBadge
         status={row.status === UserStatus.ACTIVE ? BadgeStatus.SUCCESS : BadgeStatus.ERROR}
         value={row.status === UserStatus.ACTIVE ? translations.active : translations.restricted}
@@ -82,6 +82,16 @@ export const UserListTableHeaders: TableColumn<IUser>[] = [
     minWidth: '10rem',
     name: <DataTableNameHeader text={translations.created} />,
     sortable: true,
-    selector: (row: IUser) => formatDate(row?.createdOn as string),
+    selector: (row: IUserWithApplications) => formatDate(row?.createdOn as string),
   },
 ];
+
+export const UserListTableHeaderOrganizationAlias: TableColumn<IUserWithApplications> = {
+  id: 'organizationAlias',
+  name: <DataTableNameHeader text={translations.organizationAlias} />,
+  sortable: true,
+  grow: 1,
+  wrap: false,
+  minWidth: '15rem',
+  selector: (row: IUserWithApplications) => row.organizationAlias,
+};
diff --git a/frontend/src/pages/users/interfaces/Invite.interface.ts b/frontend/src/pages/users/interfaces/Invite.interface.ts
index 83d09ad86..2d23f4ef5 100644
--- a/frontend/src/pages/users/interfaces/Invite.interface.ts
+++ b/frontend/src/pages/users/interfaces/Invite.interface.ts
@@ -4,4 +4,6 @@ export interface IInvite {
   email: string;
   phone: string;
   createdOn: Date;
+  role: string;
+  organization: { id: number; organizationGeneral: { alias: string } };
 }
diff --git a/frontend/src/pages/users/interfaces/User.interface.ts b/frontend/src/pages/users/interfaces/User.interface.ts
index da587065c..c049de342 100644
--- a/frontend/src/pages/users/interfaces/User.interface.ts
+++ b/frontend/src/pages/users/interfaces/User.interface.ts
@@ -13,3 +13,14 @@ export interface IUser extends BaseEntity {
   availableAppsList?: string;
   availableApps: { id: number; name: string; type: string }[];
 }
+
+export interface IUserWithApplications extends BaseEntity {
+  name: string;
+  email: string;
+  phone: string;
+  status: UserStatus;
+  availableApps: { id: number; name: string; type: string }[];
+  availableAppsIDs: number[];
+  organizationId: number;
+  organizationAlias: string;
+}
diff --git a/frontend/src/services/nomenclature/Nomenclature.queries.ts b/frontend/src/services/nomenclature/Nomenclature.queries.ts
index 224f44ac9..3781ebee2 100644
--- a/frontend/src/services/nomenclature/Nomenclature.queries.ts
+++ b/frontend/src/services/nomenclature/Nomenclature.queries.ts
@@ -16,12 +16,14 @@ import {
   getPracticeDomains,
   getServiceDomains,
   getBeneficiaries,
+  getIssuers,
 } from './Nomenclatures.service';
 import { Coalition } from '../../common/interfaces/coalitions.interface';
 import { Federation } from '../../common/interfaces/federations.interface';
 import { Skill } from '../../common/interfaces/skill.interface';
 import { Faculty } from '../../common/interfaces/faculty.interface';
 import { alphabeticallySort } from '../../common/helpers/utils.helper';
+import { Issuer } from '../../common/interfaces/issuer.interface';
 
 export const useCitiesQuery = (countyId: number) => {
   const { setCities } = useStore();
@@ -42,6 +44,17 @@ export const useCountiesQuery = () => {
   });
 };
 
+export const useIssuersQuery = () => {
+  const { setIssuers } = useStore();
+  return useQuery(['issuers'], () => getIssuers(), {
+    cacheTime: 1000 * 60 * 60,
+    staleTime: 1000 * 60 * 60,
+    onSuccess: (data: Issuer[]) => {
+      setIssuers(data);
+    },
+  });
+};
+
 export const useDomainsQuery = () => {
   const { setDomains } = useStore();
   return useQuery('domains', () => getDomains(), {
diff --git a/frontend/src/services/nomenclature/Nomenclatures.service.ts b/frontend/src/services/nomenclature/Nomenclatures.service.ts
index d23ebaea5..543fa81cd 100644
--- a/frontend/src/services/nomenclature/Nomenclatures.service.ts
+++ b/frontend/src/services/nomenclature/Nomenclatures.service.ts
@@ -60,3 +60,7 @@ export const getSkills = (): Promise<Skill[]> => {
 export const getFaculties = (): Promise<Faculty[]> => {
   return API.get(`/nomenclatures/faculties`).then((res) => res.data);
 };
+
+export const getIssuers = (): Promise<{ id: number; name: string }[]> => {
+  return API.get(`/nomenclatures/issuers`).then((res) => res.data);
+};
diff --git a/frontend/src/services/organization/Organization.queries.ts b/frontend/src/services/organization/Organization.queries.ts
index 2a52ca656..79c56ec76 100644
--- a/frontend/src/services/organization/Organization.queries.ts
+++ b/frontend/src/services/organization/Organization.queries.ts
@@ -7,7 +7,10 @@ import { CompletionStatus } from '../../pages/organization/enums/CompletionStatu
 import { Contact } from '../../pages/organization/interfaces/Contact.interface';
 import { Expense } from '../../pages/organization/interfaces/Expense.interface';
 import { Income } from '../../pages/organization/interfaces/Income.interface';
-import { IOrganizationFull } from '../../pages/organization/interfaces/Organization.interface';
+import {
+  IOrganizationFull,
+  IOrganizationView,
+} from '../../pages/organization/interfaces/Organization.interface';
 import { IOrganizationActivity } from '../../pages/organization/interfaces/OrganizationActivity.interface';
 import { IOrganizationFinancial } from '../../pages/organization/interfaces/OrganizationFinancial.interface';
 import { IOrganizationGeneral } from '../../pages/organization/interfaces/OrganizationGeneral.interface';
@@ -17,8 +20,10 @@ import { useSelectedOrganization } from '../../store/selectors';
 import useStore from '../../store/store';
 import {
   activateOrganization,
+  deleteBalanceSheetFile,
   deleteInvestors,
   deleteInvestorsByProfile,
+  deleteNonPolicalAffiliationFile,
   deleteOrganizationStatute,
   deletePartners,
   deletePartnersByProfile,
@@ -59,6 +64,8 @@ interface OrganizationPayload {
   };
   logo?: File | null;
   organizationStatute?: File | null;
+  nonPoliticalAffiliationFile?: File | null;
+  balanceSheetFile?: File | null;
 }
 
 /**SUPER ADMIN */
@@ -78,7 +85,7 @@ export const useOrganizationsQuery = (
     () =>
       getOrganizations(limit, page, orderBy, orderDirection, search, status, interval, userCount),
     {
-      onSuccess: (data: PaginatedEntity<IOrganizationFull>) => {
+      onSuccess: (data: PaginatedEntity<IOrganizationView>) => {
         setOrganizations({
           items: data.items,
           meta: { ...data.meta, orderByColumn: orderBy, orderDirection },
@@ -154,8 +161,22 @@ export const useOrganizationMutation = () => {
   } = useStore();
   const { organizationFinancial } = useSelectedOrganization();
   return useMutation(
-    ({ id, organization, logo, organizationStatute }: OrganizationPayload) =>
-      patchOrganization(id as number, organization, logo, organizationStatute),
+    ({
+      id,
+      organization,
+      logo,
+      organizationStatute,
+      nonPoliticalAffiliationFile,
+      balanceSheetFile,
+    }: OrganizationPayload) =>
+      patchOrganization(
+        id as number,
+        organization,
+        logo,
+        organizationStatute,
+        nonPoliticalAffiliationFile,
+        balanceSheetFile,
+      ),
     {
       onSuccess: (
         data:
@@ -275,8 +296,20 @@ export const useOrganizationByProfileMutation = () => {
   } = useStore();
   const { organizationFinancial } = useSelectedOrganization();
   return useMutation(
-    ({ organization, logo, organizationStatute }: OrganizationPayload) =>
-      patchOrganizationByProfile(organization, logo, organizationStatute),
+    ({
+      organization,
+      logo,
+      organizationStatute,
+      nonPoliticalAffiliationFile,
+      balanceSheetFile,
+    }: OrganizationPayload) =>
+      patchOrganizationByProfile(
+        organization,
+        logo,
+        organizationStatute,
+        nonPoliticalAffiliationFile,
+        balanceSheetFile,
+      ),
     {
       onSuccess: (
         data:
@@ -369,6 +402,37 @@ export const useDeleteOrganizationStatuteMutation = () => {
   );
 };
 
+export const useDeleteNonPoliticalAffiliationFileMutation = () => {
+  const { setOrganizationLegal, organizationLegal } = useStore();
+  return useMutation(
+    ({ organizationId }: { organizationId: number }) =>
+      deleteNonPolicalAffiliationFile(organizationId),
+    {
+      onSuccess: () => {
+        setOrganizationLegal({
+          ...(organizationLegal as IOrganizationLegal),
+          nonPoliticalAffiliationFile: undefined,
+        });
+      },
+    },
+  );
+};
+
+export const useDeleteBalanceSheetFileMutation = () => {
+  const { setOrganizationLegal, organizationLegal } = useStore();
+  return useMutation(
+    ({ organizationId }: { organizationId: number }) => deleteBalanceSheetFile(organizationId),
+    {
+      onSuccess: () => {
+        setOrganizationLegal({
+          ...(organizationLegal as IOrganizationLegal),
+          balanceSheetFile: undefined,
+        });
+      },
+    },
+  );
+};
+
 export const useRetryAnafFinancialMutation = () => {
   const { setOrganizationFinancial } = useStore();
   return useMutation(
diff --git a/frontend/src/services/organization/Organization.service.ts b/frontend/src/services/organization/Organization.service.ts
index db707dd96..690054c20 100644
--- a/frontend/src/services/organization/Organization.service.ts
+++ b/frontend/src/services/organization/Organization.service.ts
@@ -27,8 +27,16 @@ export const patchOrganizationByProfile = (
   update: any,
   logo?: File | null,
   organizationStatute?: File | null,
+  nonPoliticalAffiliationFile?: File | null,
+  balanceSheetFile?: File | null,
 ): Promise<any> => {
-  const payload = generateOrganizationFormDataPayload(update, logo, organizationStatute);
+  const payload = generateOrganizationFormDataPayload(
+    update,
+    logo,
+    organizationStatute,
+    nonPoliticalAffiliationFile,
+    balanceSheetFile,
+  );
   return API.patch(`/organization-profile`, payload, {
     headers: { 'Content-Type': 'multipart/form-data' },
   }).then((res) => res.data);
@@ -128,8 +136,16 @@ export const patchOrganization = (
   update: any,
   logo?: File | null,
   organizationStatute?: File | null,
+  nonPoliticalAffiliationFile?: File | null,
+  balanceSheetFile?: File | null,
 ): Promise<any> => {
-  const payload = generateOrganizationFormDataPayload(update, logo, organizationStatute);
+  const payload = generateOrganizationFormDataPayload(
+    update,
+    logo,
+    organizationStatute,
+    nonPoliticalAffiliationFile,
+    balanceSheetFile,
+  );
   return API.patch(`/organization/${id}`, payload, {
     headers: { 'Content-Type': 'multipart/form-data' },
   }).then((res) => res.data);
@@ -167,10 +183,22 @@ export const deleteOrganizationStatute = (organizationId: number) => {
   return API.delete(`organization/${organizationId}/statute`).then((res) => res.data);
 };
 
+export const deleteNonPolicalAffiliationFile = (organizationId: number) => {
+  return API.delete(`organization/${organizationId}/non-political-affiliation`).then(
+    (res) => res.data,
+  );
+};
+
+export const deleteBalanceSheetFile = (organizationId: number) => {
+  return API.delete(`organization/${organizationId}/balance-sheet`).then((res) => res.data);
+};
+
 const generateOrganizationFormDataPayload = (
   update: any,
   logo?: File | null,
   organizationStatute?: File | null,
+  nonPoliticalAffiliationFile?: File | null,
+  balanceSheetFile?: File | null,
 ) => {
   let payload = new FormData();
 
@@ -203,5 +231,13 @@ const generateOrganizationFormDataPayload = (
     payload.append('organizationStatute', organizationStatute);
   }
 
+  if (nonPoliticalAffiliationFile) {
+    payload.append('nonPoliticalAffiliationFile', nonPoliticalAffiliationFile);
+  }
+
+  if (balanceSheetFile) {
+    payload.append('balanceSheetFile', balanceSheetFile);
+  }
+
   return payload;
 };
diff --git a/frontend/src/services/organization/OrganizationFormDataMapper.service.ts b/frontend/src/services/organization/OrganizationFormDataMapper.service.ts
index f9dbf6c30..7390f2327 100644
--- a/frontend/src/services/organization/OrganizationFormDataMapper.service.ts
+++ b/frontend/src/services/organization/OrganizationFormDataMapper.service.ts
@@ -19,8 +19,15 @@ export const mapOrganizationGeneralToFormData = (
   general: ICreateOrganizationGeneral,
   organizationGeneralKey: string,
 ): FormData => {
-  const { city, county, contact, organizationCity, organizationCounty, ...organizationGeneral } =
-    general;
+  const {
+    city,
+    county,
+    contact,
+    organizationCity,
+    organizationCounty,
+    associationRegistryIssuer,
+    ...organizationGeneral
+  } = general;
 
   // map basic organization general fields
   let organizationGeneralPayload = mapEntityToFormData(
@@ -33,6 +40,11 @@ export const mapOrganizationGeneralToFormData = (
   organizationGeneralPayload.append(`${organizationGeneralKey}[countyId]`, county?.id.toString());
   organizationGeneralPayload.append(`${organizationGeneralKey}[cityId]`, city?.id.toString());
 
+  organizationGeneralPayload.append(
+    `${organizationGeneralKey}[associationRegistryIssuerId]`,
+    associationRegistryIssuer?.id.toString(),
+  );
+
   // map optional address dada
   if (organizationCity) {
     organizationGeneralPayload.append(
diff --git a/frontend/src/services/user/User.queries.ts b/frontend/src/services/user/User.queries.ts
index e526dd61a..02247f882 100644
--- a/frontend/src/services/user/User.queries.ts
+++ b/frontend/src/services/user/User.queries.ts
@@ -14,7 +14,7 @@ import {
 import { useMutation, useQuery } from 'react-query';
 import useStore from '../../store/store';
 import { IUserPayload } from '../../pages/users/interfaces/UserPayload.interface';
-import { IUser } from '../../pages/users/interfaces/User.interface';
+import { IUserWithApplications } from '../../pages/users/interfaces/User.interface';
 import { PaginatedEntity } from '../../common/interfaces/paginated-entity.interface';
 import { OrderDirection } from '../../common/enums/sort-direction.enum';
 import { UserStatus } from '../../pages/users/enums/UserStatus.enum';
@@ -72,7 +72,7 @@ export const useUsersQuery = (
         availableAppsIDs?.map((app) => app.id),
       ),
     {
-      onSuccess: (data: PaginatedEntity<IUser>) => {
+      onSuccess: (data: PaginatedEntity<IUserWithApplications>) => {
         setUsers({
           items: data.items,
           meta: { ...data.meta, orderByColumn: orderBy, orderDirection },
diff --git a/frontend/src/services/user/User.service.ts b/frontend/src/services/user/User.service.ts
index d1ae4b158..a4f6c2f21 100644
--- a/frontend/src/services/user/User.service.ts
+++ b/frontend/src/services/user/User.service.ts
@@ -1,10 +1,9 @@
-import { AxiosResponseHeaders } from 'axios';
 import { formatISO9075 } from 'date-fns';
 import { OrderDirection } from '../../common/enums/sort-direction.enum';
 import { PaginatedEntity } from '../../common/interfaces/paginated-entity.interface';
 import { UserStatus } from '../../pages/users/enums/UserStatus.enum';
 import { IInvite } from '../../pages/users/interfaces/Invite.interface';
-import { IUser } from '../../pages/users/interfaces/User.interface';
+import { IUser, IUserWithApplications } from '../../pages/users/interfaces/User.interface';
 import { IUserPayload } from '../../pages/users/interfaces/UserPayload.interface';
 import API from '../API';
 
@@ -64,7 +63,7 @@ export const getUsers = async (
   interval?: Date[],
   organizationId?: number,
   availableAppsIDs?: number[],
-): Promise<PaginatedEntity<IUser>> => {
+): Promise<PaginatedEntity<IUserWithApplications>> => {
   let requestUrl = `/user?limit=${limit}&page=${page}&orderBy=${orderBy}&orderDirection=${orderDirection}`;
 
   if (search) requestUrl = `${requestUrl}&search=${search}`;
diff --git a/frontend/src/store/nomenclature/nomenclature.selectors.ts b/frontend/src/store/nomenclature/nomenclature.selectors.ts
index ef4735ae5..f11fe9be8 100644
--- a/frontend/src/store/nomenclature/nomenclature.selectors.ts
+++ b/frontend/src/store/nomenclature/nomenclature.selectors.ts
@@ -9,5 +9,16 @@ export const useNomenclature = () => {
   const coalitions = useStore((state) => state.coalitions);
   const skills = useStore((state) => state.skills);
   const faculties = useStore((state) => state.faculties);
-  return { counties, cities, domains, regions, federations, coalitions, skills, faculties };
+  const issuers = useStore((state) => state.issuers);
+  return {
+    counties,
+    cities,
+    domains,
+    regions,
+    federations,
+    coalitions,
+    skills,
+    faculties,
+    issuers,
+  };
 };
diff --git a/frontend/src/store/nomenclature/nomenclature.slice.ts b/frontend/src/store/nomenclature/nomenclature.slice.ts
index afcc62997..c148e2b79 100644
--- a/frontend/src/store/nomenclature/nomenclature.slice.ts
+++ b/frontend/src/store/nomenclature/nomenclature.slice.ts
@@ -4,6 +4,7 @@ import { County } from '../../common/interfaces/county.interface';
 import { Domain } from '../../common/interfaces/domain.interface';
 import { Faculty } from '../../common/interfaces/faculty.interface';
 import { Federation } from '../../common/interfaces/federations.interface';
+import { Issuer } from '../../common/interfaces/issuer.interface';
 import { Region } from '../../common/interfaces/region.interface';
 import { Skill } from '../../common/interfaces/skill.interface';
 
@@ -17,6 +18,7 @@ export const nomenclatureSlice = (set: any) => ({
   coalitions: [],
   skills: [],
   faculties: [],
+  issuers: [],
   setCounties: (counties: County[]) => {
     set({ counties });
   },
@@ -41,6 +43,9 @@ export const nomenclatureSlice = (set: any) => ({
   setFaculties: (faculties: Faculty[]) => {
     set({ faculties });
   },
+  setIssuers: (issuers: Issuer[]) => {
+    set({ issuers });
+  },
 });
 
 export default { nomenclatureSlice };
diff --git a/frontend/src/store/organization/organizations.slice.ts b/frontend/src/store/organization/organizations.slice.ts
index fbc3bab44..a31bf52ce 100644
--- a/frontend/src/store/organization/organizations.slice.ts
+++ b/frontend/src/store/organization/organizations.slice.ts
@@ -1,6 +1,9 @@
 import { OrderDirection } from '../../common/enums/sort-direction.enum';
 import { PaginatedEntity } from '../../common/interfaces/paginated-entity.interface';
-import { IOrganizationFull } from '../../pages/organization/interfaces/Organization.interface';
+import {
+  IOrganizationFull,
+  IOrganizationView,
+} from '../../pages/organization/interfaces/Organization.interface';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const organizationsSlice = (set: any) => ({
@@ -16,7 +19,7 @@ export const organizationsSlice = (set: any) => ({
       orderDirection: OrderDirection.ASC,
     },
   },
-  setOrganizations: (organizations: PaginatedEntity<IOrganizationFull>) => {
+  setOrganizations: (organizations: PaginatedEntity<IOrganizationView>) => {
     set({ organizations });
   },
 });
diff --git a/frontend/src/store/store.ts b/frontend/src/store/store.ts
index 9b7157e17..5993583bd 100644
--- a/frontend/src/store/store.ts
+++ b/frontend/src/store/store.ts
@@ -16,10 +16,11 @@ import { Federation } from '../common/interfaces/federations.interface';
 import { organizationLegalSlice } from './organization/organization-legal.slice';
 import { organizationReportsSlice } from './organization/organization-reports.slice';
 import { profileSlice } from './user/Profile.slice';
-import { IUser } from '../pages/users/interfaces/User.interface';
+import { IUser, IUserWithApplications } from '../pages/users/interfaces/User.interface';
 import {
   IOrganization,
   IOrganizationFull,
+  IOrganizationView,
 } from '../pages/organization/interfaces/Organization.interface';
 import { organizationSlice } from './organization/organization.slice';
 import { usersSlice } from './user/Users.slice';
@@ -45,9 +46,10 @@ import { Skill } from '../common/interfaces/skill.interface';
 import { Faculty } from '../common/interfaces/faculty.interface';
 import { IFeedback } from '../pages/civic-center-service/interfaces/Feedback.interface';
 import { feedbacksSlice } from './civic-center-service/Feedback.slice';
+import { Issuer } from '../common/interfaces/issuer.interface';
 
 interface OrganizationState {
-  organizations: PaginatedEntity<IOrganizationFull>;
+  organizations: PaginatedEntity<IOrganizationView>;
   organization: IOrganization | null;
   organizationGeneral: IOrganizationGeneral | null;
   organizationFinancial: IOrganizationFinancial[];
@@ -60,7 +62,7 @@ interface OrganizationState {
   setOrganizationFinancial: (organizationFinancial: IOrganizationFinancial[]) => void;
   setOrganizationReport: (organizationReport: IOrganizationReport) => void;
   setOrganizationLegal: (organizationLegal: IOrganizationLegal) => void;
-  setOrganizations: (organizations: PaginatedEntity<IOrganizationFull>) => void;
+  setOrganizations: (organizations: PaginatedEntity<IOrganizationView>) => void;
 }
 interface NomenclatureState {
   counties: County[];
@@ -71,6 +73,7 @@ interface NomenclatureState {
   coalitions: Coalition[];
   skills: Skill[];
   faculties: Faculty[];
+  issuers: Issuer[];
   setCounties: (counties: County[]) => void;
   setCities: (cities: City[]) => void;
   setDomains: (domains: Domain[]) => void;
@@ -79,6 +82,7 @@ interface NomenclatureState {
   setCoalitions: (coaltions: Coalition[]) => void;
   setSkills: (skills: Skill[]) => void;
   setFaculties: (faculties: Faculty[]) => void;
+  setIssuers: (issuers: Issuer[]) => void;
 }
 
 interface ProfileState {
@@ -87,8 +91,8 @@ interface ProfileState {
 }
 
 interface UserState {
-  users: PaginatedEntity<IUser>;
-  setUsers: (users: PaginatedEntity<IUser>) => void;
+  users: PaginatedEntity<IUserWithApplications>;
+  setUsers: (users: PaginatedEntity<IUserWithApplications>) => void;
 }
 
 interface InviteState {
diff --git a/frontend/src/store/user/Users.slice.ts b/frontend/src/store/user/Users.slice.ts
index c8ed2c321..0c0a3109f 100644
--- a/frontend/src/store/user/Users.slice.ts
+++ b/frontend/src/store/user/Users.slice.ts
@@ -1,6 +1,6 @@
 import { OrderDirection } from '../../common/enums/sort-direction.enum';
 import { PaginatedEntity } from '../../common/interfaces/paginated-entity.interface';
-import { IUser } from '../../pages/users/interfaces/User.interface';
+import { IUserWithApplications } from '../../pages/users/interfaces/User.interface';
 
 export const usersSlice = (set: any) => ({
   users: {
@@ -15,7 +15,7 @@ export const usersSlice = (set: any) => ({
       orderDirection: OrderDirection.ASC,
     },
   },
-  setUsers: (users: PaginatedEntity<IUser>) => {
+  setUsers: (users: PaginatedEntity<IUserWithApplications>) => {
     set({ users });
   },
 });