diff --git a/src/locales/en.json b/src/locales/en.json
index 676c885..d39c3d8 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -202,6 +202,7 @@
       "labelDescription": "Project description",
       "descriptionHelp": "You can use markdown",
       "labelCustomer": "Customer name*",
+      "labelCustomerAddress": "Customer address",
       "labelCaptain": "Project captain*",
       "buttonSubmit": "Save"
     },
@@ -211,6 +212,7 @@
       "title": "Edit your project",
       "labelName": "Project name *",
       "labelCustomer": "Customer name *",
+      "labelCustomerAddress": "Customer address",
       "labelCaptain": "Captain *",
       "labelDescription": "Project description",
       "descriptionHelp": "You can use markdown",
diff --git a/src/locales/es.json b/src/locales/es.json
index 8019338..539883b 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -202,6 +202,7 @@
       "labelDescription": "Descripción del proyecto",
       "descriptionHelp": "Puedes usar markdown",
       "labelCustomer": "Nombre del/la clientx *",
+      "labelCustomerAddress": "Dirección del/la clientx",
       "labelCaptain": "Líder del proyecto *",
       "buttonSubmit": "Guardar"
     },
@@ -211,6 +212,7 @@
       "title": "Modificar tu proyecto",
       "labelName": "Nombre del proyecto *",
       "labelCustomer": "Nombre del/la clientx *",
+      "labelCustomerAddress": "Dirección del/la clientx",
       "labelCaptain": "Capitain *",
       "labelDescription": "Descripción del proyecto",
       "descriptionHelp": "Puedes usar markdown",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index ac3d9dd..a02276d 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -200,6 +200,7 @@
       "labelDescription": "Description du projet",
       "descriptionHelp": "Vous pouvez utiliser Markdown",
       "labelCustomer": "Nom du client*",
+      "labelCustomerAddress": "Adresse du client",
       "labelCaptain": "Capitaine du projet*",
       "buttonSubmit": "Enregistrer"
     },
@@ -209,6 +210,7 @@
       "title": "Modifie ton projet",
       "labelName": "Nom du projet *",
       "labelCustomer": "Nom du client *",
+      "labelCustomerAddress": "Adresse du client",
       "labelCaptain": "Capitaine *",
       "labelDescription": "Description du projet",
       "descriptionHelp": "Vous pouvez utiliser Markdown",
diff --git a/src/views/partials/admin/page-admin-projects-create.pug b/src/views/partials/admin/page-admin-projects-create.pug
index 467b7ae..75e7212 100644
--- a/src/views/partials/admin/page-admin-projects-create.pug
+++ b/src/views/partials/admin/page-admin-projects-create.pug
@@ -16,7 +16,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
   solid-form.form(
     data-src=`${getComponent('projects').endpoints.post}`
 
-    fields='status, customer.name, name, description, help, captain, linebreak'
+    fields='status,customer(customer.name, customer.address), name, description, help, captain, linebreak'
     range-captain=`${getComponent('projects').endpoints.captains}`
     
     required-status
@@ -27,13 +27,15 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
 
     label-status=''
     label-customer.name=''
+    label-customer.address=''
     label-name=''
     label-description=''
     label-help=''
     label-captain=''
     
     class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
-    class-name='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
+    class-customer.address='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
+    class-name='segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading'
     class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading'
     class-help='segment full text-small margin-bottom-medium padding-left-small'
     class-captain='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal'
@@ -50,5 +52,5 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
     submit-widget="button"
     next=getRoute('projects', true)
 
-    data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit'
+    data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-customer.address=project.create.labelCustomerAddress;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit'
   )
diff --git a/src/views/partials/project/page-project-edit.pug b/src/views/partials/project/page-project-edit.pug
index 08ff1a7..bf33b9c 100644
--- a/src/views/partials/project/page-project-edit.pug
+++ b/src/views/partials/project/page-project-edit.pug
@@ -32,7 +32,7 @@ div.segment.full.padding-large.whitespace-normal
     solid-form.form(
       bind-resources
 
-      fields='customer.name, name, description, help, captain, linebreak'
+      fields='customer(customer.name, customer.address), name, description, help, captain, linebreak'
       required-customer.name
       required-name
       required-captain
@@ -40,12 +40,14 @@ div.segment.full.padding-large.whitespace-normal
 
       label-name=''
       label-customer.name=''
+      label-customer.address=''
       label-description=''
       label-captain=''
       label-help=''
 
       class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
-      class-name='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
+      class-customer.address='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
+      class-name='segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading'
       class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading'
       class-captain='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal'
       class-linebreak='segment full'
@@ -62,7 +64,7 @@ div.segment.full.padding-large.whitespace-normal
       submit-widget="button"
       next=`${component.route}-information`
 
-      data-trans='label-name=project.edit.labelName;label-captain=project.edit.labelCaptain;label-customer.name=project.edit.labelCustomer;label-description=project.edit.labelDescription;label-help=project.edit.descriptionHelp;submit-button=project.edit.buttonSubmit'
+      data-trans='label-name=project.edit.labelName;label-captain=project.edit.labelCaptain;label-customer.name=project.edit.labelCustomer;label-customer.address=project.edit.labelCustomerAddress;label-description=project.edit.labelDescription;label-help=project.edit.descriptionHelp;submit-button=project.edit.buttonSubmit'
     )
 
   h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.subTitle')