diff --git a/app/assets/stylesheets/components/_card.scss b/app/assets/stylesheets/components/_card.scss
new file mode 100644
index 0000000..0168d41
--- /dev/null
+++ b/app/assets/stylesheets/components/_card.scss
@@ -0,0 +1,39 @@
+.card {
+	.card-disabled-message {
+		display: none;
+	}
+	&.card-disabled {
+		position: relative;
+		.card-disabled-message {
+			background-color: theme-color('danger');
+			border-radius: $border-radius;
+			color: $white;
+			display: block;
+			font-weight: bold;
+			font-size: .7rem;
+			left: 50%;
+			opacity: .7;
+			padding: .3rem;
+			padding-left: 1rem;
+			padding-right: 1rem;
+			position: absolute;
+			text-align: center;
+			text-transform: uppercase;
+			bottom: -.5rem;
+			transform: translate(-50%, -50%);
+			z-index: 11;
+		}
+		&:after {
+			$strip-color-1: transparentize(theme-color('danger'), .7);
+			$strip-color-2: transparentize(theme-color('danger'), .8);
+			background-image: repeating-linear-gradient(45deg, $strip-color-1, $strip-color-1 30px, $strip-color-2 30px, $strip-color-2 60px);
+			content: ' ';
+			height: 100%;
+			left: 0;
+			position: absolute;
+			top: 0;
+			width: 100%;
+			z-index: 10;
+		}
+	}
+}
diff --git a/app/views/pages/account/account_address.liquid b/app/views/pages/account/account_address.liquid
index 6709470..d5731ef 100755
--- a/app/views/pages/account/account_address.liquid
+++ b/app/views/pages/account/account_address.liquid
@@ -17,18 +17,29 @@ slug: addresses
     <h1 class="h3">{{'account_address_lists' | translate  }}</h1>
   </div>
   <div class="col-auto">
+  {% if store.customer.permission.address.create == true %}
     <form action="{% path_to account_address_form %}" method="post">
       <button type="submit" name="button" class="btn btn-outline-primary">
         <i class="fa fa-plus"></i> {{'account_address_add' | translate}}
       </button>
     </form>
+  {% endif %}
   </div>
   <div class="col-12">
     {% with_scope address_type: "address"%}
       <div class="row">
-        {% for address in store.addresses%}
-          <div class="col-12  mt-3 mb-2">
-            <div class="card card-body">
+        {% for address in store.addresses %}
+          {% assign address_css = "" %}
+          {% if address.enabled != true %}
+            {% assign address_css = "card-disabled" %}
+          {% endif %}
+          <div class="col-12 mt-3 mb-2">
+            <div class="card card-body {{address_css}}">
+              {% if address.enabled != true %}
+                <div class="card-disabled-message">
+                  {{ 'account_address_disabled' | translate }}
+                </div>
+              {% endif %}
               <div class="row">
                 <div class="col-12 col-lg-4 border-right ">
                   <div class="row align-items-center">
@@ -39,21 +50,27 @@ slug: addresses
                        {{address.name}}
                     </div>
                   </div>
-                  <div class="row small pt-3 pb-2">
-                    <form action="{% path_to account_address_form %}" method="post" class="col-6">
-                      <input type="hidden" name="item_id" value="{{address.id}}">
-                      <button type="submit" name="update_{{address.id}}" class="btn btn-outline-primary btn-block">
-                        <i class="fas fa-pencil-alt"></i> {{'cart_address_update' | translate }}
-                      </button>
-                    </form>
-                    <form method="POST" action="/invader/addresses/{{address.id | round}}/delete" class="col-6">
-                      <input type="hidden" name="invader_success_url" value="{% path_to page %}" />
-                      <input type="hidden" name="invader_error_url" value="{% path_to page %}" />
-                      <button type="submit" name="button" class="btn btn-outline-danger btn-block">
-                          <i class="fas fa-trash"></i> {{'cart_address_delete' | translate }}
-                      </button>
-                    </form>
-                  </div>
+                  {% if address.enabled %}
+                    <div class="row small pt-3 pb-2">
+                      {% if address.access.update %}
+                        <form action="{% path_to account_address_form %}" method="post" class="col-6">
+                          <input type="hidden" name="item_id" value="{{address.id}}">
+                          <button type="submit" name="update_{{address.id}}" class="btn btn-sm btn-outline-primary btn-block">
+                            <i class="fas fa-pencil-alt"></i> {{'cart_address_update' | translate }}
+                          </button>
+                        </form>
+                      {% endif %}
+                      {% if address.access.delete %}
+                        <form method="POST" action="/invader/addresses/{{address.id | round}}/delete" class="col-6">
+                          <input type="hidden" name="invader_success_url" value="{% path_to page %}" />
+                          <input type="hidden" name="invader_error_url" value="{% path_to page %}" />
+                          <button type="submit" name="button" class="btn btn-sm btn-outline-danger btn-block">
+                            <i class="fas fa-trash"></i> {{'cart_address_delete' | translate }}
+                          </button>
+                        </form>
+                      {% endif %}
+                    </div>
+                  {% endif %}
                 </div>
                 <div class="col-12 col-lg-8">
                   <address>
@@ -69,6 +86,9 @@ slug: addresses
                     <div class="">
                       {{address.country.name}}
                     </div>
+                    <div class="">
+                      {{address.phone}}
+                    </div>
                   </address>
                 </div>
               </div>
diff --git a/app/views/pages/account/account_address_form.liquid b/app/views/pages/account/account_address_form.liquid
index e80ad0c..3631b60 100755
--- a/app/views/pages/account/account_address_form.liquid
+++ b/app/views/pages/account/account_address_form.liquid
@@ -7,13 +7,26 @@ seo_title: Update my address | Shopinvader demo
 {% extends 'layouts/account '%}
 
 {% block 'body/content/tabcontent' %}
-{% assign form_action = '/invader/addresses/create' %}
+
+{% assign disabled = true %}
 {% if params.item_id %}
-  {% with_scope id: params.item_id %}
+  {% assign item_id = params.item_id | round %}
+  {% with_scope id: item_id %}
     {% assign address = store.addresses.first %}
-
-    {% assign form_action = '/invader/addresses/' | append: address.id | append: "/update" %}
+    {% if address.enabled and address.access.update %}
+      {% assign form_action = '/invader/addresses/' | append: address.id | append: "/update" %}
+      {% assign disabled = false %}
+    {% else %}
+      {% assign error_msg = 'account_address_no_update' | translate %}
+    {% endif %}
   {% endwith_scope%}
+{% else %}
+  {% if store.customer.permission.address.create == true%}
+    {% assign form_action = '/invader/addresses/create' %}
+    {% assign disabled = false %}
+  {% else %}
+      {% assign error_msg = 'account_address_no_create' | translate %}
+  {% endif %}
 {% endif %}
 <div class="pt-4">
   <div class="card">
@@ -22,19 +35,49 @@ seo_title: Update my address | Shopinvader demo
       {{'account_address_update' | translate  }}
     </h2>
     <div class="card-body">
-      <form class="" action="{{form_action}}" method="post" data-autocomplete="address">
-        <input type="hidden" name="invader_success_url" value="{% path_to account_address %}" />
-        <input type="hidden" name="invader_error_url" value="{% path_to page %}{{form_params}}" />
-        {% include 'address_form' with address, with_require: true %}
+      {% if disabled == true %}
         <div class="row">
-          <div class="col-6 text-left">
-            <a href="{% path_to account_address %}" class="btn btn-default " >{{'account_address_cancel' | translate}}</a>
+          <div class="col-12">
+            <div class="text-danger text-center">
+              <i class="fas fa-exclamation-triangle"></i>
+              {{error_msg}}
+            </div>
           </div>
-          <div class="col-6 text-right">
-            <input type="submit" name="submit" class="btn btn-primary " value="{{'account_address_submit' | translate}}">
+        </div>
+        {% if address %}
+          {% include 'address_form' with 
+            address,
+            disabled: true
+          %}
+        {% endif %}
+        <div class="row pt-2">
+          <div class="col-12 text-center">
+            <a href="{% path_to account_address %}" class="btn btn-dark ">
+              {{'btn_back' | translate}}
+            </a>
           </div>
         </div>
-      </form>
+      {% else %}
+        <form class="" action="{{form_action}}" method="post" data-autocomplete="address">
+          <input type="hidden" name="invader_success_url" value="{% path_to account_address %}" />
+          <input type="hidden" name="invader_error_url" value="{% path_to page %}{{form_params}}" />
+          {% include 'address_form' with 
+             address, 
+             with_require: true,
+             disabled: false
+          %}
+          <div class="row">
+            <div class="col-6 text-left">
+              <a href="{% path_to account_address %}" class="btn btn-outline-dark ">
+                {{'account_address_cancel' | translate}}
+              </a>
+            </div>
+            <div class="col-6 text-right">
+              <input type="submit" name="submit" class="btn btn-primary " value="{{'account_address_submit' | translate}}">
+            </div>
+          </div>
+        </form>
+      {% endif %}
     </div>
   </div>
 </div>
diff --git a/app/views/pages/account/account_profile.liquid b/app/views/pages/account/account_profile.liquid
index a8e3000..6c595f1 100755
--- a/app/views/pages/account/account_profile.liquid
+++ b/app/views/pages/account/account_profile.liquid
@@ -11,20 +11,43 @@ seo_title: My account profile | Shopinvader demo
     <div class="col-12 col-lg-7">
       {% with_scope address_type: "profile"%}
         {% assign profile = store.addresses.first %}
+        {% assign disabled = true %}
+        {% if profile.access.update %}
+          {% assign disabled = false %}
+        {% endif %}
         <div class="card">
           <h2 class="card-header bg-white">
             <i class="far fa-user text-primary"></i>  
             {{'account_profil_title' | translate}}
           </h2>
           <div class="card-body">
+          {% if disabled == true %}
+            <div class="row">
+              <div class="col-12">
+                <div class="text-danger text-center">
+                  <i class="fas fa-exclamation-triangle"></i>
+                  {{ 'account_address_no_update' | translate }}
+                </div>
+              </div>
+            </div>
+            {% include 'address_form' with 
+              address: profile,
+              disabled: true
+            %}
+          {% else %}
             <form action="/invader/addresses/{{profile.id | round}}/update" method="post" data-autocomplete="address">
               <input type="hidden" name="invader_success_url" value="{% path_to page %}" />
               <input type="hidden" name="invader_error_url" value="{% path_to page %}" />
-              {% include 'address_form' with address: profile %}
-              <div class="text-right">
-                <input type="submit" name="submit" class="btn btn-primary " value="{{'account_address_submit' | translate}}">
-              </div>
+              {% include 'address_form' with 
+                address: profile
+              %}
+              {% if profile.access.update %}
+                <div class="text-right">
+                  <input type="submit" name="submit" class="btn btn-primary " value="{{'account_address_submit' | translate}}">
+                </div>
+              {% endif %}
             </form>
+          {% endif %}
           </div>
         </div>
       {% endwith_scope%}
diff --git a/app/views/pages/account/account_user_disabled.liquid b/app/views/pages/account/account_user_disabled.liquid
new file mode 100644
index 0000000..741d488
--- /dev/null
+++ b/app/views/pages/account/account_user_disabled.liquid
@@ -0,0 +1,26 @@
+---
+handle: account_user_disabled
+title: Account User disabled
+listed: false
+position: 200
+published: true
+seo_title: Your account is not enable yet | Shopinvader demo
+slug: addresses-user-disabled
+---
+{% extends 'layouts/account '%}
+
+{% block 'body/content/tabcontent' %}
+	<div class="text-center">
+		<p>
+			{{ 'account_user_disabled' | translate }}
+		</p>
+		<form method="post" action="{% path_to account %}">
+	    <input type="hidden" name="auth_action" value="sign_out" />
+	    <input type="hidden" name="auth_content_type" value="customers" />
+	    <button type="submit" class="btn btn-outline-primary " >
+	      <i class="fa fa-power-off"></i>
+	      {{ 'account_signout' | translate }}
+	    </button>
+	  </form>
+	</div>
+{% endblock %}
\ No newline at end of file
diff --git a/app/views/pages/layouts/base.liquid b/app/views/pages/layouts/base.liquid
index f24c4da..8077c23 100644
--- a/app/views/pages/layouts/base.liquid
+++ b/app/views/pages/layouts/base.liquid
@@ -3,6 +3,14 @@ handle: base
 title: Base layout
 is_layout: false
 ---
+{% if current_customer and page.handle != 'account_user_disabled' %}
+  {% if store.customer.enabled != true %}
+    {% action 'redirect to account_user_disabled' %}
+      redirectTo('account_user_disabled');
+    {% endaction %}
+  {% endif %}
+{% endif %}
+
 {% if locale != default_locale %}
   {% assign url_base ="/" | append: locale %}
 {% endif%}
diff --git a/app/views/sections/cart_address.liquid b/app/views/sections/cart_address.liquid
index acbd3a9..77b3a69 100644
--- a/app/views/sections/cart_address.liquid
+++ b/app/views/sections/cart_address.liquid
@@ -20,39 +20,76 @@ blocks: []
     </div>
     <div class="cart-items cart-addresses">
       {% if params.item_id %}
-        {% assign form_action = '/invader/addresses/create' %}
-        {% if params.item_id and params.item_id != ''%}
-          {% with_scope id: params.item_id %}
+        {% assign disabled = true %}
+        {% assign item_id = params.item_id | round %}
+        
+        {% if item_id != null %}
+          {% with_scope id: item_id %}
             {% assign address = store.addresses.first %}
-            {% assign form_action = '/invader/addresses/' | append: address.id | append: "/update" %}
+            {% if address.enabled and address.access.update %}
+              {% assign form_action = '/invader/addresses/' | append: address.id | append: "/update" %}
+              {% assign disabled = false %}
+            {% else %}
+              {% assign error_msg = 'account_address_no_update' | translate %}
+            {% endif %}
           {% endwith_scope%}
+        {% else %}
+          {% if store.customer.permission.address.create %}
+            {% assign form_action = '/invader/addresses/create' %}
+            {% assign disabled = false %}
+          {% else %}
+              {% assign error_msg = 'account_address_no_create' | translate %}
+          {% endif %}
         {% endif %}
-        <form method="post" action="{{form_action}}" id="cart_update_form">
-          <input type="hidden" name="invader_success_url" value="{% path_to page %}" />
-          <input type="hidden" name="invader_error_url" value="{% path_to page %}?item_id={{address.id}}" />
+        {% if disabled %}
           <div class="row">
-            <div class="col-12 text-left pb-3 pt-3">
-              <a href="{% path_to page %}" class="text-dark text-uppercase font-weight-bold">
+            <div class="col-12">
+              <div class="text-danger text-center">
+                <i class="fas fa-exclamation-triangle"></i>
+                {{error_msg}}
+              </div>
+              {% include "address_form" with 
+                address, 
+                with_require: true
+                disabled: true
+              %}
+              <a href="{% path_to page %}" class="text-dark text-uppercase font-weight-bold mb-3 mt-3">
                 <i class="fas fa-chevron-left"></i> {{'btn_back' | translate }}
               </a>
             </div>
           </div>
-          <div class="row">
-            <div class="col-12">
-              {% include "address_form" with address, with_require: true %}
+        {% else %}
+          <form method="post" action="{{form_action}}" id="cart_update_form">
+            <input type="hidden" name="invader_success_url" value="{% path_to page %}" />
+            <input type="hidden" name="invader_error_url" value="{% path_to page %}?item_id={{address.id}}" />
+            <div class="row">
+              <div class="col-12 text-left pb-3 pt-3">
+                <a href="{% path_to page %}" class="text-dark text-uppercase font-weight-bold">
+                  <i class="fas fa-chevron-left"></i> {{'btn_back' | translate }}
+                </a>
+              </div>
             </div>
-          </div>
-          <div class="row">
-            <div class="col-6">
-              <a href="{% path_to page %}" class="text-dark text-uppercase font-weight-bold">
-                <i class="fas fa-chevron-left"></i> {{'btn_back' | translate }}
-              </a>
+            <div class="row">
+              <div class="col-12">
+                {% include "address_form" with 
+                  address, 
+                  with_require: true
+                  disabled: true
+                %}
+              </div>
             </div>
-            <div class="col-6 text-right">
-              <button type="submit" class="btn btn-outline-dark" name="Submit">{{"cart_submit" | translate}}</button>
+            <div class="row">
+              <div class="col-6">
+                <a href="{% path_to page %}" class="text-dark text-uppercase font-weight-bold">
+                  <i class="fas fa-chevron-left"></i> {{'btn_back' | translate }}
+                </a>
+              </div>
+              <div class="col-6 text-right">
+                <button type="submit" class="btn btn-outline-dark" name="Submit">{{"cart_submit" | translate}}</button>
+              </div>
             </div>
-          </div>
-        </form>
+          </form>
+        {% endif %}
       {% else %}
         {% assign selected_address = store.cart.shipping.address %}
         {% if selected_address == null %}
@@ -64,12 +101,13 @@ blocks: []
               {{'cart_shipping_address' | translate }}
             </h4>
           </div>
-          <div class="col-auto">
-            <a href="{% path_to page %}?item_id=" class="btn btn-outline-dark btn-sm">
-              {{ 'account_address_add' | translate }}
-            </a>
-          </a>
-          </div>
+          {% if store.customer.permission.address.create %}
+            <div class="col-auto">
+              <a href="{% path_to page %}?item_id=" class="btn btn-outline-dark btn-sm">
+                {{ 'account_address_add' | translate }}
+              </a>
+            </div>
+          {% endif %}
           <div class="col-12">
             <form method="post" action="/invader/cart/update" id="cart_carrier_form" data-shopinvader-form>
               <input type="hidden" name="invader_success_url" value="{% path_to page %}" />
@@ -77,25 +115,43 @@ blocks: []
               <input type="hidden" name="step[current]" value="cart_address">
               <input type="hidden" name="step[next]" value="cart_checkout">
               {%for address in store.addresses %}
-                <input data-autosubmit 
-                  type="radio" 
-                  value="{{address.id | round}}" 
-                  name="shipping[address][id]" 
-                  id="shipping{{address.id | round}}"
-                  autocomplete="off"
-                  class="address-input" 
-                  {%if address.id == selected_address.id %} checked="checked" {%endif%}
-                />
-                <label class="cart-item cart-address" for="shipping{{address.id | round}}">
+                {% if address.enabled %}
+                  {% assign address_css = "" %}
+                  <input data-autosubmit 
+                    type="radio" 
+                    value="{{address.id | round}}" 
+                    name="shipping[address][id]" 
+                    id="shipping{{address.id | round}}"
+                    autocomplete="off"
+                    class="address-input" 
+                    {%if address.id == selected_address.id %} checked="checked" {%endif%}
+                  />
+                {% else %}
+                  {% assign address_css = "card card-disabled" %}
+                  <input data-autosubmit 
+                    type="radio" 
+                    value="0"  
+                    autocomplete="off"
+                    class="address-input" 
+                  />
+                {% endif %}
+                <label class="cart-item cart-address {{address_css}}" for="shipping{{address.id | round}}">
+                  {% if address.enabled != true %}
+                    <div class="card-disabled-message">
+                      {{ 'account_address_disabled' | translate }}
+                    </div>
+                  {% endif %}
                   <div class="cart-address-selector"></div>
                   <div class="cart-address-name">
                     {{ address.name }}
                   </div>
                   <div class="cart-address-update">
+                    {% if address.enabled and address.access.update %}
                       <a href="{% path_to page %}?item_id={{address.id}}" class="btn btn-outline-primary btn-sm">
                         {{ 'cart_address_update' | translate }}
                       </a>
-                    </div>
+                    {% endif %}
+                  </div>
                   <div class="cart-address-address">
                     <i class="ti-location-pin pr-2 pt-1"></i> 
                     <div>
@@ -140,73 +196,60 @@ blocks: []
                   <input type="hidden" name="step[current]" value="cart_address">
                   <input type="hidden" name="step[next]" value="cart_checkout">
                   {%for address in store.addresses %}
-                    <input data-autosubmit 
-                      type="radio" 
-                      value="{{address.id | round}}" 
-                      name="invoicing[address][id]" 
-                      id="invoicing{{address.id | round}}"
-                      autocomplete="off"
-                      class="address-input" 
-                      {%if address.id == selected_address.id %} checked="checked" {%endif%}
-                    />
-                    <label class="cart-address" for="invoicing{{address.id | round}}">
-                  <div class="cart-address-selector"></div>
-                  <div class="cart-address-name">
-                    {{ address.name }}
-                  </div>
-                  <div class="cart-address-update">
-                      <a href="{% path_to page %}?item_id={{address.id}}" class="btn btn-outline-primary btn-sm">
-                        {{ 'cart_address_update' | translate }}
-                      </a>
-                    </div>
-                  <div class="cart-address-address">
-                    <i class="ti-location-pin pr-2 pt-1"></i> 
-                    <div>
-                      {{ address.street }}<br>
-                      {% if address.street2 != "" %}
-                        {{ address.street2 }}<br>
-                      {% endif %}
-                      {{ address.zip }} - {{ address.city }}, {{ address.country.name }}
-                    </div>
-                  </div>
-                  <div class="cart-address-phone">
-                    {% if address.phone != "" %}
-                      <i class="fas fa-phone pr-2"></i>
-                      <div>{{ address.phone }}</div>
+                    {% if address.enabled %}
+                      {% assign address_css = "" %}
+                      <input data-autosubmit 
+                        type="radio" 
+                        value="{{address.id | round}}" 
+                        name="invoicing[address][id]" 
+                        id="invoicing{{address.id | round}}"
+                        autocomplete="off"
+                        class="address-input" 
+                        {%if address.id == selected_address.id %} checked="checked" {%endif%}
+                      />
+                    {% else %}
+                      {% assign address_css = "card card-disabled" %}
+                      <input data-autosubmit 
+                        type="radio" 
+                        value="0"  
+                        autocomplete="off"
+                        class="address-input" 
+                      />
                     {% endif %}
-                  </div>
-                  </label>
-                  <label class="d-none container pt-3 pb-3" for="shipping{{address.id | round}}">
-                    <div class="row">
-                      <div class="col-6 pb-2">
-                        <b>{{ address.name }}</b>
+                    <label class="cart-item cart-address {{address_css}}" for="invoicing{{address.id | round}}">
+                      {% if address.enabled != true %}
+                        <div class="card-disabled-message">
+                          {{ 'account_address_disabled' | translate }}
+                        </div>
+                      {% endif %}
+                      <div class="cart-address-selector"></div>
+                      <div class="cart-address-name">
+                        {{ address.name }}
                       </div>
-                      <div class="col-6 text-right">
-                        <a href="{% path_to page %}?item_id={{address.id}}" class="font-style-underline">
-                          {{ 'cart_address_update' | translate }}
-                        </a>
+                      <div class="cart-address-update">
+                        {% if address.enabled and address.access.update %}
+                          <a href="{% path_to page %}?item_id={{address.id}}" class="btn btn-outline-primary btn-sm">
+                            {{ 'cart_address_update' | translate }}
+                          </a>
+                        {% endif %}
                       </div>
-                      <div class="col-12 ">
-                        <div class="d-flex">
-                          <i class="ti-location-pin pr-2 pt-1"></i> 
-                          <div>
-                            {{ address.street }}<br>
-                            {% if address.street2 != "" %}
-                              {{ address.street2 }}<br>
-                            {% endif %}
-                            {{ address.zip }} - {{ address.city }}, {{ address.country.name }}
-                          </div>
-                        </div>
-                        <div class="d-flex pt-2">
-
-                          {% if address.phone != "" %}
-                            <i class="fas fa-phone pr-2"></i>
-                            <div>{{ address.phone }}</div>
+                      <div class="cart-address-address">
+                        <i class="ti-location-pin pr-2 pt-1"></i> 
+                        <div>
+                          {{ address.street }}<br>
+                          {% if address.street2 != "" %}
+                            {{ address.street2 }}<br>
                           {% endif %}
+                          {{ address.zip }} - {{ address.city }}, {{ address.country.name }}
                         </div>
                       </div>
-                    </div>
-                  </label>
+                      <div class="cart-address-phone">
+                        {% if address.phone != "" %}
+                          <i class="fas fa-phone pr-2"></i>
+                          <div>{{ address.phone }}</div>
+                        {% endif %}
+                      </div>
+                    </label>
                   {% endfor %}
                 </form>
               </div>
@@ -223,7 +266,8 @@ blocks: []
     <div class="cart-desc">
       {{section.settings.desc}}
     </div>
-    {% if store.cart.shipping.address.id != null %}
+    {% assign shipping_address = store.cart.shipping.address. %}
+    {% if shipping_address.id != null and shipping_address.enabled %}
       {% assign display_submit = true %}
     {% else %}
       {% assign display_submit = false %}
diff --git a/app/views/snippets/address_form.liquid b/app/views/snippets/address_form.liquid
index 4e02a91..13c342a 100755
--- a/app/views/snippets/address_form.liquid
+++ b/app/views/snippets/address_form.liquid
@@ -26,21 +26,29 @@
   }
 
 {% endaction %}
+{% if disabled %}
+  {% assign field_disabled = "disabled='disabled'" %}
+{% endif %}
+
 <div class="address-form">
-  <input type="hidden" id="id" name="{{ 'id' | prepend: prefix | append: suffix }}" value="{{address.id | round}}">
-  <div class="row">
-    <div class="col-12">
-      <div class="form-group">
-        <label for="{{ 'name' | prepend: prefix_id }}" class="required">{{ "partner_name" | translate }}</label>
-        <input type="text" name="{{ 'name' | prepend: prefix | append: suffix }}" class="form-control" id="{{ 'name' | prepend: prefix_id }}" placeholder="{{ 'partner_name' | translate }}" {{require}} value="{{address.name}}" autocomplete="off">
+  {% if address.id != null %}
+    <input type="hidden" id="id" name="{{ 'id' | prepend: prefix | append: suffix }}" value="{{address.id | round}}">
+  {% endif %}
+  {% if hide_name != true %}
+    <div class="row">
+      <div class="col-12">
+        <div class="form-group">
+          <label for="{{ 'name' | prepend: prefix_id }}" class="required">{{ "partner_name" | translate }}</label>
+          <input type="text" name="{{ 'name' | prepend: prefix | append: suffix }}" class="form-control" id="{{ 'name' | prepend: prefix_id }}" placeholder="{{ 'partner_name' | translate }}" {{require}} {{field_disabled}} value="{{address.name}}" autocomplete="off">
+        </div>
       </div>
     </div>
-  </div>
+  {% endif %}
   <div class="row">
     <div class="col-12">
       <div class="form-group">
         <label for="{{ 'street' | prepend: prefix_id }}" >{{ 'partner_address1' | translate }}</label>
-        <input type="text" name="{{ 'street' | prepend: prefix | append: suffix }}" class="form-control" data-toggle="autocomplete" id="{{ 'street' | prepend: prefix_id }}" placeholder="{{ 'partner_address1' | translate }}" {{require}} data-bind="route" autocomplete="off" value="{{address.street}}">
+        <input type="text" name="{{ 'street' | prepend: prefix | append: suffix }}" class="form-control" data-toggle="autocomplete" id="{{ 'street' | prepend: prefix_id }}" placeholder="{{ 'partner_address1' | translate }}" {{require}} {{field_disabled}} data-bind="route" autocomplete="off" value="{{address.street}}">
       </div>
     </div>
   </div>
@@ -48,7 +56,7 @@
     <div class="col-12">
       <div class="form-group">
         <label for="{{ 'street2' | prepend: prefix_id }}"> {{ 'partner_address2' | translate }}</label>
-        <input type="text" name="{{ 'street2' | prepend: prefix | append: suffix }}" class="form-control" id="{{ 'street2' | prepend: prefix_id }}" value="{{address.street2}}" placeholder="{{ 'partner_address2' | translate }}" autocomplete="off">
+        <input type="text" name="{{ 'street2' | prepend: prefix | append: suffix }}" class="form-control" id="{{ 'street2' | prepend: prefix_id }}" value="{{address.street2}}" placeholder="{{ 'partner_address2' | translate }}" {{field_disabled}} autocomplete="off">
       </div>
     </div>
   </div>
@@ -56,32 +64,38 @@
     <div class="col-5 col-sm-3">
       <div class="form-group">
         <label for="{{ 'zip' | prepend: prefix_id }}" class="required">{{ 'partner_zipcode' | translate }}</label>
-        <input type="text" name="{{ 'zip' | prepend: prefix | append: suffix }}" class="form-control" id="{{ 'zip' | prepend: prefix_id }}" value="{{address.zip}}" placeholder="{{ 'partner_zipcode' | translate }}" {{require}} data-bind="postal_code" autocomplete="off">
+        <input type="text" name="{{ 'zip' | prepend: prefix | append: suffix }}" class="form-control" id="{{ 'zip' | prepend: prefix_id }}" value="{{address.zip}}" placeholder="{{ 'partner_zipcode' | translate }}" {{require}} {{field_disabled}} autocomplete="off">
       </div>
     </div>
     <div class="col-7 col-sm-6">
       <div class="form-group">
         <label for="{{ 'city' | prepend: prefix_id }}" class="required">{{ 'partner_city' | translate }}</label>
-        <input type="text" name="{{ 'city' | prepend: prefix | append: suffix }}" class="form-control" id="{{ 'city' | prepend: prefix_id }}" value="{{address.city}}" placeholder="{{ 'partner_city' | translate }}" {{require}} data-bind="locality" autocomplete="off">
+        <input type="text" name="{{ 'city' | prepend: prefix | append: suffix }}" class="form-control" id="{{ 'city' | prepend: prefix_id }}" value="{{address.city}}" placeholder="{{ 'partner_city' | translate }}" {{require}} {{field_disabled}} autocomplete="off">
       </div>
     </div>
     <div class="col-12 col-sm-3">
       <div class="form-group">
-        <label for="{{ 'country_id' | prepend: prefix_id }}" class="required">{{ 'partner_country' | translate }}</label>
-        <select class="form-control" id="{{ 'country_id' | prepend: prefix_id }}" name="{{ 'country[id]' | prepend: prefix | append: suffix }}">
-        {% for country in store.available_countries %}
-          <option value="{{country.id}}" {%if country.id == adresse.country_id %}selected="selected"{%endif%}>{{country.name}}</option>
-        {% endfor %}
-        </select>
+        <label for="{{ 'country_id' | prepend: prefix_id }}" class="required">
+          {{ 'partner_country' | translate }}
+        </label>
+        {% include 'form_m2o_field' with
+          values: store.available_countries,
+          value: address.country.id,
+          field_name: 'country[id]',
+          field_id: 'country_id',
+          label: 'partner_country' | translate
+          disabled
+        %}
       </div>
     </div>
-    <div class="col-12 col-sm-6">
-      <div class="form-group">
-        <label for="{{ 'phone' | prepend: prefix_id }}" class="required">{{ 'partner_phone' | translate }}</label>
-        <input type="tel" class="form-control" id="{{ 'phone' | prepend: prefix_id }}" name="{{ 'phone' | prepend: prefix | append: suffix }}" placeholder="{{ 'partner_phone' | translate }}" value="{{address.phone}}" autocomplete="off" {{require}}>
+    {% if hide_phone != true %}
+      <div class="col-12 col-sm-6">
+        <div class="form-group">
+          <label for="{{ 'phone' | prepend: prefix_id }}" class="required">{{ 'partner_phone' | translate }}</label>
+          <input type="tel" class="form-control" id="{{ 'phone' | prepend: prefix_id }}" name="{{ 'phone' | prepend: prefix | append: suffix }}" placeholder="{{ 'partner_phone' | translate }}" value="{{address.phone}}" autocomplete="off" {{require}} {{field_disabled}}>
+        </div>
       </div>
-    </div>
-
+    {% endif %}
   </div>
 </div>
 {% endblock %}
diff --git a/app/views/snippets/form_m2o_field.liquid b/app/views/snippets/form_m2o_field.liquid
new file mode 100644
index 0000000..69a917f
--- /dev/null
+++ b/app/views/snippets/form_m2o_field.liquid
@@ -0,0 +1,17 @@
+{% if values != null and values.size > 0 %}
+  {% if field_id == null %}
+    {% assign field_id = field_name %}
+  {% endif %}
+  {% if disabled == true %}
+    {% assign field_disabled = "disabled='disabled'" %}
+  {% endif %}
+  <select class="form-control" id="{{ field_id }}" name="{{ field_name }}" {{field_disabled}}>
+  {% for item in values %}
+    {% assign item_value = item.id | append:'' %}
+    {% assign value = value | append:'' %}
+    <option value="{{item.id}}" {%if item_value == value %}selected="selected"{%endif%}>
+      {{item.name}}
+    </option>
+  {% endfor %}
+  </select>
+{% endif %}
diff --git a/config/translations.yml b/config/translations.yml
index 2860fb7..7aeea5b 100755
--- a/config/translations.yml
+++ b/config/translations.yml
@@ -115,6 +115,18 @@ account_profil_title:
 account_address_lists:
   en: My addresses
   fr: Mes adresses
+account_address_disabled:
+  en: This address is not activated yet
+  fr: Cette adresse n'est pas encore activée
+account_address_no_update:
+  en: You can not edit this address
+  fr: Vous ne pouvez pas modifier cette adresse
+account_address_no_create:
+  en: You can not create a new address
+  fr: Vous ne pouvez pas créer une nouvelle adresse
+account_user_disabled:
+  en: Your account is not activated. You can not use it now. Please disconnect to continue.
+  fr: Votre compte n'est pas activé. Vous ne pouvez pas l'utiliser maintenant. Veuillez vous déconnecter pour continuer.
 account_password_reset:
   en: Reset my password
   fr: Réinitialiser mon mot de passe