diff --git a/app/views/admin/enterprises/_form.html.haml b/app/views/admin/enterprises/_form.html.haml
index a334774410..c6cb8037fe 100644
--- a/app/views/admin/enterprises/_form.html.haml
+++ b/app/views/admin/enterprises/_form.html.haml
@@ -2,20 +2,20 @@
   - case item[:name]
   - when 'primary_details'
     %fieldset.alpha.no-border-bottom{ id: "#{item[:name]}_panel", data: { controller: "primary-details", "primary-details-primary-producer-value": @enterprise.is_primary_producer.to_s, "primary-details-enterprise-sells-value": @enterprise.sells, "tabs-and-panels-target": "panel default" }}
-      %legend= t("#{ item[:name] }")
+      %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= 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= t(".#{ item[:name] }.legend")
 
   - else
     %fieldset.alpha.no-border-bottom{ id: "#{item[:name]}_panel", data: { "tabs-and-panels-target": "panel"  }}
-      %legend= t("#{ item[:name] }")
+      %legend= t(".#{ item[:form_name] || item[:name] }.legend")
       = render "admin/enterprises/form/#{ item[:form_name] || item[:name] }", f: f
diff --git a/app/views/admin/enterprises/form/_business_details.html.haml b/app/views/admin/enterprises/form/_business_details.html.haml
index 15e9a1f4c4..b39773b5ad 100644
--- a/app/views/admin/enterprises/form/_business_details.html.haml
+++ b/app/views/admin/enterprises/form/_business_details.html.haml
@@ -51,7 +51,7 @@
 
 = f.fields_for :business_address, @enterprise.business_address || @enterprise.build_business_address do |bf|
   %fieldset.alpha.no-border-bottom
-    %legend= t('business_address')
+    %legend= t('.business_address_legend')
     = render 'admin/enterprises/form/business_address', bf: bf
 
   .row{"data-controller": "updateinput"}
@@ -60,7 +60,7 @@
 
 .row
   %fieldset.alpha.no-border-bottom
-    %legend= t('.Invoice_item_sorting')
+    %legend= t('.invoice_item_sorting_legend')
   .three.columns.alpha
     %label= t('.sort_items_by_supplier?')
     %div{'ofn-with-tip' => t('.sort_items_by_supplier_tip')}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1550b837ec..dc920b5097 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -869,11 +869,15 @@ en:
         manage: Manage
       form:
         about_us:
+          legend: "About"
           desc_short: Short Description
           desc_short_placeholder: Tell us about your enterprise in one or two sentences
           desc_long: About Us
           desc_long_placeholder: Tell customers about yourself. This information appears on your public profile.
+        address:
+          legend: "Address"
         business_details:
+          legend: "Business Details"
           abn: ABN
           abn_placeholder: eg. 99 123 456 789
           acn: ACN
@@ -884,7 +888,8 @@ en:
           remove_terms_and_conditions: "Remove File"
           uploaded_on: "uploaded on"
           reset_form: "Reset Form"
-          Invoice_item_sorting: Invoice item sorting
+          business_address_legend: "Business Address"
+          invoice_item_sorting_legend: "Invoice item sorting"
           sort_items_by_supplier?: Sort items by supplier?
           sort_items_by_supplier_tip: "When enabled, Items will be sorted by supplier name."
           enabled: Enable
@@ -898,6 +903,7 @@ en:
           legal_phone_number: Legal phone number
           phone_placeholder: "98 123 4565"
         contact:
+          legend: "Contact"
           name: Name
           name_placeholder: eg. Gustav Plum
           email_address: Public Email Address
@@ -911,14 +917,17 @@ en:
           website: Website
           website_placeholder: eg. www.truffles.com
         enterprise_fees:
+          legend: "Enterprise Fees"
           name: Name
           fee_type: Fee Type
           manage_fees: Manage Enterprise Fees
           no_fees_yet: You don't have any enterprise fees yet.
           create_button: Create One Now
         enterprise_permissions:
+          legend: "Enterprise Permissions"
           enterprise_relationships: Enterprise Relationships
         images:
+          legend: "Images"
           logo: Logo
           promo_image_placeholder: 'This image is displayed in "About Us"'
           promo_image_note1: 'PLEASE NOTE:'
@@ -927,6 +936,7 @@ en:
           remove_logo: "Remove Image"
           remove_promo_image: "Remove Image"
         inventory_settings:
+          legend: "Inventory Settings"
           text1: You may opt to manage stock levels and prices in via your
           inventory: inventory
           text2: >
@@ -937,6 +947,7 @@ en:
           preferred_product_selection_from_inventory_only_yes: New products can be put into my shopfront (recommended)
           preferred_product_selection_from_inventory_only_no: New products must be added to my inventory before they can be put into my shopfront
         payment_methods:
+          legend: "Payment Methods"
           name: Name
           applies: Applies?
           manage: Manage Payment Methods
@@ -944,6 +955,7 @@ en:
           create_button: Create New Payment Method
           create_one_button: Create One Now
         primary_details:
+          legend: "Primary Details"
           name: Name
           name_placeholder: eg. Professor Plum's Biodynamic Truffles
           groups: Groups
@@ -962,6 +974,8 @@ en:
           visible: Public
           not_visible: Hidden
           hidden: Hide all references
+        properties:
+          legend: "Properties"
         permalink:
           permalink: Permalink (no spaces)
           permalink_tip: "This permalink is used to create the url to your shop: %{link}your-shop-name/shop"
@@ -970,6 +984,7 @@ en:
           ofn_uid: OFN UID
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network.
         shipping_methods:
+          legend: "Shipping Methods"
           name: "Name"
           applies: "Active?"
           manage: "Manage Shipping Methods"
@@ -977,6 +992,7 @@ en:
           create_one_button: "Create One Now"
           no_method_yet: "You don't have any shipping methods yet."
         shop_preferences:
+          legend: "Shop Preferences"
           shopfront_requires_login: "Publicly visible shopfront?"
           shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
           shopfront_requires_login_false: "Public"
@@ -1022,6 +1038,7 @@ en:
           enabled: "Enabled"
           disabled: "Disabled"
         social:
+          legend: "Social"
           twitter_placeholder: "eg. @the_prof"
           instagram_placeholder: "eg. the_prof"
           facebook_placeholder: "eg. www.facebook.com/PageNameHere"
@@ -1039,6 +1056,7 @@ en:
             i_agree: I Agree
             cancel: Cancel
         tag_rules:
+          legend: "Tag Rules"
           default_rules:
             by_default: By Default
             no_rules_yet: No default rules apply yet
@@ -1049,6 +1067,7 @@ en:
           add_new_rule: '+ Add A New Rule'
           add_new_tag: '+ Add A New Tag'
         users:
+          legend: "Users"
           email_confirmation_notice_html: "Email confirmation is pending. We've sent a confirmation email to %{email}."
           resend: Resend
           owner: 'Owner'