diff --git a/plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb
index e462f34..d7d2ace 100644
--- a/plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb
+++ b/plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb
@@ -15,9 +15,21 @@
     <ul>
       <li><b><%= _('Full name') %>: </b><%= @customer[:name] %></li>
       <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li>
-      <li><b><%= _('Address') %>: </b><%= @customer[:address] %><br \>
-      <%= @customer[:city]+'-'+@customer[:state]+'-'+@customer[:country] %><br \>
-      <%= @customer[:zip_code] %></li>
+      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? %>
+        <li><b><%= _('Address') %>:</b>
+      <% end %>
+      <% if !@customer[:address].blank? %>
+        <%= @customer[:address] %><br \>
+      <% end %>
+      <% if !@customer[:city].blank? %>
+        <%= @customer[:city] %><br \>
+      <% end %>
+      <% if !@customer[:zip_code].blank? %>
+        <%= @customer[:zip_code] %>
+      <% end %>
+      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? %>
+        </li>
+      <% end %>
     </ul>
 
     <p><%=_('Here are the products you bought:')%></p>
diff --git a/plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
index 5464470..52ee61a 100644
--- a/plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
+++ b/plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
@@ -13,11 +13,22 @@
 
     <ul>
       <li><b><%= _('Full name') %>: </b><%= @customer[:name] %></li>
-      <li><b><%= _('Email') %>: </b><%= @customer[:email] %></li>
       <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li>
-      <li><b><%= _('Address') %>: </b><%= @customer[:address] %><br \>
-      <%= @customer[:city]+'-'+@customer[:state]+'-'+@customer[:country] %><br \>
-      <%= @customer[:zip_code] %></li>
+      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? %>
+        <li><b><%= _('Address') %>:</b>
+      <% end %>
+      <% if !@customer[:address].blank? %>
+        <%= @customer[:address] %><br \>
+      <% end %>
+      <% if !@customer[:city].blank? %>
+        <%= @customer[:city] %><br \>
+      <% end %>
+      <% if !@customer[:zip_code].blank? %>
+        <%= @customer[:zip_code] %>
+      <% end %>
+      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? %>
+        </li>
+      <% end %>
     </ul>
 
     <p><%=_('And here are the items bought by this customer:')%></p>
diff --git a/plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
index 7e2f146..d4f5448 100644
--- a/plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
+++ b/plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
@@ -10,7 +10,6 @@
     <fieldset><legend><%=_('Delivery Address')%></legend>
       <%= labelled_form_field(_('Address (street and number)'), f.text_field(:address)) %>
       <%= labelled_form_field( _("City"), f.text_field(:city)) %>
-      <%= labelled_form_field( _("State"), f.text_field(:state)) %>
       <%= labelled_form_field(_('ZIP code'), f.text_field(:zip_code)) %>
     </fieldset>
     <div id="cart-form-actions">
--
libgit2 0.21.2