diff --git a/app/views/admin/orders/_form.html.haml b/app/views/admin/orders/_form.html.haml
index 970cf79..4b27dc0 100644
--- a/app/views/admin/orders/_form.html.haml
+++ b/app/views/admin/orders/_form.html.haml
@@ -1,8 +1,15 @@
 = semantic_form_for [:admin,@order], :remote => true do |form| 
   .content
     = form.inputs do 
-      = form.input :name, :label => "Prénom / nom :" 
-      = form.input :email, :label => "Email :" 
+      =f.input :email, :label => "Email :"
+      =f.input :name, :label => "Nom :"
+      =f.input :firstname, :label => "Prénom :"
+      =f.input :street1, :label => "Adresse :"
+      =f.input :street2, :label => "Adresse (suite) :"
+      =f.input :postal_code, :label => "Code Postal :"
+      =f.input :cityname, :label => "Ville :"
+
+      =f.input :country, :label => "Pays :", :as => :string
       = form.input :payment_type, :label => "Type de paiement : ", :collection => {"Paypal" => "1", "Offert" => "2", "Chèque" => "3"}, :include_blank => false
       = form.input :paid_at, :label => "Date de paiement :", :as => :qi_date_picker
       =form.input :paid, :label => "Payé ?"
diff --git a/app/views/admin/orders/_new_form.html.haml b/app/views/admin/orders/_new_form.html.haml
index 970cf79..4b27dc0 100644
--- a/app/views/admin/orders/_new_form.html.haml
+++ b/app/views/admin/orders/_new_form.html.haml
@@ -1,8 +1,15 @@
 = semantic_form_for [:admin,@order], :remote => true do |form| 
   .content
     = form.inputs do 
-      = form.input :name, :label => "Prénom / nom :" 
-      = form.input :email, :label => "Email :" 
+      =f.input :email, :label => "Email :"
+      =f.input :name, :label => "Nom :"
+      =f.input :firstname, :label => "Prénom :"
+      =f.input :street1, :label => "Adresse :"
+      =f.input :street2, :label => "Adresse (suite) :"
+      =f.input :postal_code, :label => "Code Postal :"
+      =f.input :cityname, :label => "Ville :"
+
+      =f.input :country, :label => "Pays :", :as => :string
       = form.input :payment_type, :label => "Type de paiement : ", :collection => {"Paypal" => "1", "Offert" => "2", "Chèque" => "3"}, :include_blank => false
       = form.input :paid_at, :label => "Date de paiement :", :as => :qi_date_picker
       =form.input :paid, :label => "Payé ?"