diff --git a/app/views/spree/admin/orders/invoice.html.haml b/app/views/spree/admin/orders/invoice.html.haml
index 0982ccc21f..982ef43f59 100644
--- a/app/views/spree/admin/orders/invoice.html.haml
+++ b/app/views/spree/admin/orders/invoice.html.haml
@@ -30,13 +30,14 @@
          
       %td{ :align => "right" }
         %strong= "#{t('.to')}: #{@order.ship_address.full_name}"
-        - if @order.customer.code.present?
+        - if @order.andand.customer.andand.code.present?
           %br
           = "#{t('.code')}: #{@order.customer.code}"
         %br
         = @order.ship_address.full_address
         %br
-        = "#{@order.customer.email},"
+        - if @order.andand.customer.andand.email.present?
+          = "#{@order.customer.email},"
         = "#{@order.bill_address.phone}"
 
 = render 'spree/admin/orders/invoice_table'
diff --git a/app/views/spree/admin/orders/invoice2.html.haml b/app/views/spree/admin/orders/invoice2.html.haml
index 89f28ab308..837b2be21a 100644
--- a/app/views/spree/admin/orders/invoice2.html.haml
+++ b/app/views/spree/admin/orders/invoice2.html.haml
@@ -45,7 +45,7 @@
         = t :invoice_billing_address
         %br
         %strong= @order.ship_address.full_name
-        - if @order.customer.code.present?
+        - if @order.andand.customer.andand.code.present?
           %br
           = "Code: #{@order.customer.code}"
         %br