diff --git a/app/views/admin/enterprises/_form.html.haml b/app/views/admin/enterprises/_form.html.haml
index c6cb8037fe..dcaae1a149 100644
--- a/app/views/admin/enterprises/_form.html.haml
+++ b/app/views/admin/enterprises/_form.html.haml
@@ -5,12 +5,6 @@
       %legend= t(".#{ item[:name] }.legend")
       = render "admin/enterprises/form/#{ item[:form_name] || item[:name] }", f: f
 
-  - when 'address'
-    = f.fields_for :address do |af|
-      %fieldset.alpha.no-border-bottom{ id: "#{item[:name]}_panel", data: { "tabs-and-panels-target": "panel" }}
-        %legend= t(".#{ item[:name] }.legend")
-        = render 'admin/enterprises/form/address', af: af
-
   - when 'enterprise_permissions'
     %fieldset.alpha.no-border-bottom{ id: "#{item[:name]}_panel", data: { "tabs-and-panels-target": "panel" }}
       %legend= t(".#{ item[:name] }.legend")
diff --git a/app/views/admin/enterprises/form/_address.html.haml b/app/views/admin/enterprises/form/_address.html.haml
index 319d6097f1..64d72bbadc 100644
--- a/app/views/admin/enterprises/form/_address.html.haml
+++ b/app/views/admin/enterprises/form/_address.html.haml
@@ -1,54 +1,55 @@
 -# redo denoting required fields in the whole project
-.row
-  = t(:required_fields)
-  (
-  %span.required *
-  )
-.row
-  .three.columns.alpha
-    = af.label :address1, t(:address)
+= f.fields_for :address do |af|
+  .row
+    = t(:required_fields)
+    (
     %span.required *
-  .eight.columns.omega
-    = af.text_field :address1, { placeholder: t(:address_placeholder) }
-.row
-  .alpha.three.columns
-    = af.label :address2, t(:address2)
-  .eight.columns.omega
-    = af.text_field :address2
-.row
-  .three.columns.alpha
-    = af.label :city, t(:city)
-    \/
-    = af.label :zipcode, t(:postcode)
-    %span.required *
-  .four.columns
-    = af.text_field :city, { placeholder: t(:city_placeholder) }
-  .four.columns.omega
-    = af.text_field :zipcode, { placeholder: t(:postcode_placeholder) }
-.row{"data-controller": "dependent-select", "data-dependent-select-options-value": countries_with_states }
-  .three.columns.alpha
-    = af.label :state_id, t(:state)
-    \/
-    = af.label :country_id, t(:country)
-    %span.required *
-  .four.columns
-    = af.select :state_id, @enterprise.address.country.states.map { |s| [s.name, s.id] }, {}, { "data-controller": "tom-select", "data-dependent-select-target": "select", class: "primary" }
-  .four.columns.omega{ data: { controller: "primary-details" }}
-    = af.select :country_id, available_countries.map { |c| [c.name, c.id] }, {}, { "data-controller": "tom-select", "data-dependent-select-target": "source", "data-action": "dependent-select#handleSelectChange", class: "primary" }
-.row
-  .three.columns.alpha
-    = af.label :latitude, t(:latitude)
-    \/
-    = af.label :longitude, t(:longitude)
-    %span.required *
-    = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('latitude_longitude_tip')}
-  .four.columns
-    = af.text_field :latitude, { placeholder: t(:latitude_placeholder) }
-  .four.columns.omega
-    = af.text_field :longitude, { placeholder: t(:longitude_placeholder) }
-.row
-  .three.columns.alpha
-    = " ".html_safe
-  .five.columns.omega
-    = check_box_tag "use_geocoder"
-    = label_tag "use_geocoder", t('use_geocoder')
+    )
+  .row
+    .three.columns.alpha
+      = af.label :address1, t(:address)
+      %span.required *
+    .eight.columns.omega
+      = af.text_field :address1, { placeholder: t(:address_placeholder) }
+  .row
+    .alpha.three.columns
+      = af.label :address2, t(:address2)
+    .eight.columns.omega
+      = af.text_field :address2
+  .row
+    .three.columns.alpha
+      = af.label :city, t(:city)
+      \/
+      = af.label :zipcode, t(:postcode)
+      %span.required *
+    .four.columns
+      = af.text_field :city, { placeholder: t(:city_placeholder) }
+    .four.columns.omega
+      = af.text_field :zipcode, { placeholder: t(:postcode_placeholder) }
+  .row{"data-controller": "dependent-select", "data-dependent-select-options-value": countries_with_states }
+    .three.columns.alpha
+      = af.label :state_id, t(:state)
+      \/
+      = af.label :country_id, t(:country)
+      %span.required *
+    .four.columns
+      = af.select :state_id, @enterprise.address.country.states.map { |s| [s.name, s.id] }, {}, { "data-controller": "tom-select", "data-dependent-select-target": "select", class: "primary" }
+    .four.columns.omega{ data: { controller: "primary-details" }}
+      = af.select :country_id, available_countries.map { |c| [c.name, c.id] }, {}, { "data-controller": "tom-select", "data-dependent-select-target": "source", "data-action": "dependent-select#handleSelectChange", class: "primary" }
+  .row
+    .three.columns.alpha
+      = af.label :latitude, t(:latitude)
+      \/
+      = af.label :longitude, t(:longitude)
+      %span.required *
+      = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('latitude_longitude_tip')}
+    .four.columns
+      = af.text_field :latitude, { placeholder: t(:latitude_placeholder) }
+    .four.columns.omega
+      = af.text_field :longitude, { placeholder: t(:longitude_placeholder) }
+  .row
+    .three.columns.alpha
+      = " ".html_safe
+    .five.columns.omega
+      = check_box_tag "use_geocoder"
+      = label_tag "use_geocoder", t('use_geocoder')
diff --git a/app/webpacker/css/admin/openfoodnetwork.scss b/app/webpacker/css/admin/openfoodnetwork.scss
index aa22632fd0..485c85027b 100644
--- a/app/webpacker/css/admin/openfoodnetwork.scss
+++ b/app/webpacker/css/admin/openfoodnetwork.scss
@@ -195,7 +195,7 @@ table#listing_enterprise_groups {
 }
 
 .fullwidth_inputs {
-  input[type=text], select {
+  #{$text-inputs}, select {
     width: 100%;
   }
 }
diff --git a/app/webpacker/css/admin/shared/forms.scss b/app/webpacker/css/admin/shared/forms.scss
index e1c92e38ae..f2ef36e111 100644
--- a/app/webpacker/css/admin/shared/forms.scss
+++ b/app/webpacker/css/admin/shared/forms.scss
@@ -1,12 +1,11 @@
-input[type="text"],
-input[type="password"],
-input[type="email"],
+$text-inputs:
+  "input[type=text], input[type=password], input[type=email], input[type=url], input[type=tel]";
+
+#{$text-inputs},
 input[type="date"],
 input[type="datetime"],
 input[type="time"],
-input[type="url"],
 input[type="number"],
-input[type="tel"],
 textarea, fieldset {
   @include border-radius($border-radius);
   padding: 7px 10px;