diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 37cfeefd..9d81321d 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -64,23 +64,6 @@
               showInStore="1"
       >
         <label>Data</label>
-        <field
-                id="populate_organisation"
-                type="select"
-                translate="label,comment"
-                sortOrder="60"
-                showInDefault="1"
-                showInWebsite="1"
-                showInStore="1"
-        >
-          <label>Populate Organisation</label>
-          <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-          <config_path>idealpostcodes/settings/populate_organisation</config_path>
-          <comment>Fill the Company field based on selected address.</comment>
-          <depends>
-            <field id="enabled">1</field>
-          </depends>
-        </field>
         <field
                 id="require_county"
                 type="select"
@@ -167,6 +150,23 @@
             <field id="enabled">1</field>
           </depends>
         </field>
+        <field
+                id="remove_organisation_store"
+                type="select"
+                translate="label,comment"
+                sortOrder="90"
+                showInDefault="1"
+                showInWebsite="1"
+                showInStore="1"
+        >
+          <label>Remove Organisation</label>
+          <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+          <config_path>idealpostcodes/settings/remove_organisation_store</config_path>
+          <comment>Remove organisation name from first line of address.</comment>
+          <depends>
+            <field id="enabled">1</field>
+          </depends>
+        </field>
       </group>
       <group
               id="store_admin_configuration"
@@ -196,6 +196,23 @@
             <field id="enabled">1</field>
           </depends>
         </field>
+        <field
+                id="remove_organisation_admin"
+                type="select"
+                translate="label,comment"
+                sortOrder="90"
+                showInDefault="1"
+                showInWebsite="1"
+                showInStore="1"
+        >
+          <label>Remove Organisation</label>
+          <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+          <config_path>idealpostcodes/settings/remove_organisation_admin</config_path>
+          <comment>Remove organisation name from first line of address.</comment>
+          <depends>
+            <field id="enable_admin_integration">1</field>
+          </depends>
+        </field>
       </group>
       <group
         id="admin"
diff --git a/etc/config.xml b/etc/config.xml
index d9283736..37acf9ec 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -11,7 +11,8 @@
         <postcode_lookup>1</postcode_lookup>
         <autocomplete>1</autocomplete>
         <admin_autocomplete>1</admin_autocomplete>
-        <populate_organisation>1</populate_organisation>
+        <remove_organisation_store>1</remove_organisation_store>
+        <remove_organisation_admin>1</remove_organisation_admin>
         <require_county>0</require_county>
         <hoist_country>1</hoist_country>
         <autocomplete_override>{}</autocomplete_override>
diff --git a/view/adminhtml/templates/admin.phtml b/view/adminhtml/templates/admin.phtml
index 778c124b..a29daf93 100644
--- a/view/adminhtml/templates/admin.phtml
+++ b/view/adminhtml/templates/admin.phtml
@@ -5,7 +5,7 @@ $script = '
 document.addEventListener(\'DOMContentLoaded\', function() {
   var apiKey = "' . $helper->getConfig('api_key') . '";
   var autocomplete = ' . $helper->getConfig('addressAutocomplete') . ';
-  var populateOrganisation = ' . $helper->getConfig('populateOrganisation') . ';
+  var removeOrganisation = ' . $helper->getConfig('removeOrganisation') . ';
   var populateCounty = ' . $helper->getConfig('requireCounty') . ';
   var enabled = ' . $helper->getConfig('enabled') . ';
   var customFields = ' . trim(preg_replace("/\r|\n/", "", $helper->getConfig('customFields'))) . ';
@@ -16,7 +16,7 @@ document.addEventListener(\'DOMContentLoaded\', function() {
     postcodeLookup: false,
     autocomplete: autocomplete,
     populateCounty: populateCounty,
-    populateOrganisation: populateOrganisation,
+    removeOrganisation: removeOrganisation,
     hoistCountry: false,
     customFields: customFields
   };
diff --git a/view/frontend/templates/store.phtml b/view/frontend/templates/store.phtml
index e9ae4b8a..94ade0ac 100644
--- a/view/frontend/templates/store.phtml
+++ b/view/frontend/templates/store.phtml
@@ -1,13 +1,12 @@
 <?php
-$helper = $this->helper('Idealpostcodes\Ukaddresssearch\Helper\Data'); ?>
-
-<?php
+$helper = $this->helper('Idealpostcodes\Ukaddresssearch\Helper\Data');
 $script = '
+console.log("should be here");
 document.addEventListener(\'DOMContentLoaded\', function() {
   var apiKey = "' . $helper->getConfig('api_key') . '";
   var postcodeLookup = ' . $helper->getConfig('postcodeLookup') . ';
   var autocomplete = ' . $helper->getConfig('addressAutocomplete') . ';
-  var populateOrganisation = ' . $helper->getConfig('populateOrganisation') . ';
+  var removeOrganisation = ' . $helper->getConfig('removeOrganisation') . ';
   var hoistCountry = ' . $helper->getConfig('hoistCountryField') . ';
   var populateCounty = ' . $helper->getConfig('requireCounty') . ';
   var autocompleteOverride = ' . $helper->getConfig('autocompleteOverride') . ';
@@ -21,7 +20,7 @@ document.addEventListener(\'DOMContentLoaded\', function() {
     postcodeLookup: postcodeLookup,
     autocomplete: autocomplete,
     populateCounty: populateCounty,
-    populateOrganisation: populateOrganisation,
+    removeOrganisation: removeOrganisation,
     hoistCountry: hoistCountry,
     autocompleteOverride: autocompleteOverride,
     postcodeLookupOverride: postcodeLookupOverride,
@@ -31,4 +30,4 @@ document.addEventListener(\'DOMContentLoaded\', function() {
 });
 ';
 ?>
-<?= $secureRenderer->renderTag('script', [], $script, false); ?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript', 'id' => 'idpc-config'], $script, false); ?>