diff --git a/app/assets/javascripts/templates/admin/edit_address_dialog.html.haml b/app/assets/javascripts/templates/admin/edit_address_dialog.html.haml
index 351a267bd3..369a3e2ae6 100644
--- a/app/assets/javascripts/templates/admin/edit_address_dialog.html.haml
+++ b/app/assets/javascripts/templates/admin/edit_address_dialog.html.haml
@@ -20,12 +20,6 @@
           = t('spree.street_address_1')
         %td
           %input{ type: 'text', name: 'address2', ng: { model: 'address.address2'} }
-      %tr
-        %td
-          = t('spree.phone')
-          %span.required *
-        %td
-          %input{ type: 'text', name: 'phone', required: true, ng: { model: 'address.phone'} }
       %tr
         %td
           = t('spree.city')
@@ -54,8 +48,14 @@
           %select{name: 'state', required: true, ng: {model: 'address.state_id', options: 'state.id as state.name for state in states'}}
             %option{value: ''}
               = t('admin.customers.index.select_state')
+      %tr
+        %td
+          = t('spree.phone')
+          %span.required *
+        %td
+          %input{ type: 'text', name: 'phone', required: true, ng: { model: 'address.phone'} }
 
     .text-center
-      %input.button.red.icon-plus{ type: 'submit', value: 'Update Address'}
+      %input.button.red.icon-plus{ type: 'submit', value: t('admin.customers.index.update_address')}
 
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e9e737d664..f5f186e76c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -128,6 +128,7 @@ en:
         select_country: 'Select Country'
         select_state: 'Select State'
         edit: 'Edit'
+        update_address: 'Update Address'
 
     products:
       bulk_edit:
@@ -1072,6 +1073,7 @@ Please follow the instructions there to make your enterprise visible on the Open
   validation_msg_is_associated_with_an_exising_customer: "is associated with an existing customer"
 
   spree:
+    zipcode: Postcode
     shipment_states:
       backorder: backorder
       partial: partial