diff --git a/frontend/src/constants/profileSettingsConstants.js b/frontend/src/constants/profileSettingsConstants.js
index 4abb1b2..b6c6dba 100644
--- a/frontend/src/constants/profileSettingsConstants.js
+++ b/frontend/src/constants/profileSettingsConstants.js
@@ -35,7 +35,8 @@ export const profileTexts = {
         FIRST_NAME: 'First Name',
         LAST_NAME: 'Last Name',
         DELEGATE: 'Attention',
-        INVOICE_MAIL: 'Invoice Mail'
+        INVOICE_MAIL: 'Invoice Mail',
+        DELIVERY_MAIL: 'Delivery Mail'
     },
     buttons: {
         SAVE: 'Save',
diff --git a/frontend/src/containers/profileSettings/components/AddEditProfileAddress.jsx b/frontend/src/containers/profileSettings/components/AddEditProfileAddress.jsx
index bc0497f..b026ae1 100644
--- a/frontend/src/containers/profileSettings/components/AddEditProfileAddress.jsx
+++ b/frontend/src/containers/profileSettings/components/AddEditProfileAddress.jsx
@@ -12,7 +12,10 @@ class AddEditProfileAddress extends Component {
             idCountrySelected: address.idCountrySelected || this.props.params.countries[0].idCountry,
             city: address.city || '',
             detailedAddress: address.detailedAddress || '',
-            zipCode: address.zipCode || ''
+            zipCode: address.zipCode || '',
+            firstName: address.firstName || '',
+            lastName: address.lastName || '',
+            deliveryMail: address.deliveryMail || ''
         };
         this.props.params.onAddressChange(this.state);
 
@@ -30,16 +33,52 @@ class AddEditProfileAddress extends Component {
     }
 
     render() {
-        const {idCountrySelected, city, detailedAddress, zipCode} = this.state;
+        const {idCountrySelected, city, detailedAddress, zipCode, firstName, lastName, deliveryMail} = this.state;
         const {countries} = this.props.params;
 
         return (
             <div className="address-add-edit-content">
                 <Form className="address-edit-content">
+                <h5>{profileTexts.labels.DELEGATE}</h5>
+                    <FormGroup>
+                          <Label for="address-first-name">{profileTexts.labels.FIRST_NAME}</Label>
+                          <Input value={firstName}
+                              autoComplete="nope"
+                              onChange={this.handleChange}
+                              type="text"
+                              name="firstName"
+                              id="address-first-name"
+                              placeholder={profileTexts.labels.FIRST_NAME} />
+                    </FormGroup>
+
+                    <FormGroup>
+                          <Label for="address-last-name">{profileTexts.labels.LAST_NAME}</Label>
+                          <Input value={lastName}
+                              autoComplete="nope"
+                              onChange={this.handleChange}
+                              type="text"
+                              name="lastName"
+                              id="address-last-name"
+                              placeholder={profileTexts.labels.LAST_NAME} />
+                    </FormGroup>
+
+                    <FormGroup>
+                          <Label for="address-delivery-mail">{profileTexts.labels.DELIVERY_MAIL}</Label>
+                          <Input value={deliveryMail}
+                              autoComplete="nope"
+                              onChange={this.handleChange}
+                              type="text"
+                              name="deliveryMail"
+                              id="address-delivery-mail"
+                              placeholder={profileTexts.labels.DELIVERY_MAIL} />
+                    </FormGroup>
+
+                    <h5>{profileTexts.labels.BILLING_ADDRESSES}</h5>
                     <FormGroup>
                         <Label for="address-country">{profileTexts.labels.ADDRESS_COUNTRY}<span className="required-icon">*</span></Label>
                         <Input value={idCountrySelected}
                             type="select"
+                            autoComplete="nope"
                             onChange={this.handleChange}
                             name="idCountrySelected"
                             id="address-country"
@@ -56,6 +95,7 @@ class AddEditProfileAddress extends Component {
                           <Label for="address-city">{profileTexts.labels.ADDRESS_CITY}<span className="required-icon">*</span></Label>
                           <Input value={city}
                               onChange={this.handleChange}
+                              autoComplete="nope"
                               type="text"
                               name="city"
                               id="address-city"
@@ -65,6 +105,7 @@ class AddEditProfileAddress extends Component {
                     <FormGroup>
                           <Label for="address-details">{profileTexts.labels.ADDRESS_DETAILS}<span className="required-icon">*</span></Label>
                           <Input value={detailedAddress}
+                              autoComplete="nope"
                               onChange={this.handleChange}
                               type="textarea"
                               name="detailedAddress"
@@ -75,6 +116,7 @@ class AddEditProfileAddress extends Component {
                     <FormGroup>
                           <Label for="address-zip">{profileTexts.labels.ADDRESS_ZIP}<span className="required-icon">*</span></Label>
                           <Input value={zipCode}
+                              autoComplete="nope"
                               onChange={this.handleChange}
                               type="text"
                               name="zipCode"