From ebe968535fba21de9371147af419c940cbece335 Mon Sep 17 00:00:00 2001
From: Boris van Katwijk <borisvankatwijk@gmail.com>
Date: Fri, 27 Oct 2023 14:49:30 +0200
Subject: [PATCH] [FEATURE][IN23-253] Update module to be compatible with
 Magento 2.4.6-p3 and PHP 8.2

---
 Block/Checkout/LayoutProcessor.php            | 181 ++++----
 CHANGELOG.md                                  |  99 +++++
 COPYING.txt                                   |   6 +
 Helper/Data.php                               | 143 ++++---
 README.md                                     |   4 +-
 composer.json                                 |  40 +-
 etc/adminhtml/system.xml                      |  10 +-
 etc/config.xml                                |   8 +-
 etc/frontend/di.xml                           |   2 +-
 etc/module.xml                                |   7 +-
 i18n/en_US.csv                                |   5 -
 i18n/nl_NL.csv                                |   5 -
 registration.php                              |  13 +-
 .../layout/customer_account_create.xml        |   4 +-
 .../frontend/layout/customer_address_form.xml |   4 +-
 .../experius/customer/address/edit.phtml      | 283 ++++++++-----
 .../experius/customer/form/register.phtml     | 391 +++++++++++++-----
 view/frontend/web/template/group/group.html   |   2 +-
 18 files changed, 812 insertions(+), 395 deletions(-)
 create mode 100644 CHANGELOG.md
 create mode 100644 COPYING.txt
 delete mode 100644 i18n/en_US.csv
 delete mode 100644 i18n/nl_NL.csv

diff --git a/Block/Checkout/LayoutProcessor.php b/Block/Checkout/LayoutProcessor.php
index 2b246de..8a54d98 100644
--- a/Block/Checkout/LayoutProcessor.php
+++ b/Block/Checkout/LayoutProcessor.php
@@ -1,122 +1,167 @@
 <?php
+/**
+ * Copyright © Happy Horizon Utrecht Development & Technology B.V. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
 
 namespace Experius\AddressLines\Block\Checkout;
 
-class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcessorInterface{
-
-    protected $scopeConfig;
-
-    protected $logger;
-
-    protected $addressLineHelper;
-
+use Experius\AddressLines\Helper\Data;
+use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Psr\Log\LoggerInterface;
+
+class LayoutProcessor implements LayoutProcessorInterface
+{
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param LoggerInterface $logger
+     * @param Data $addressLineHelper
+     */
     public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Psr\Log\LoggerInterface $logger,
-        \Experius\AddressLines\Helper\Data $addressLineHelper
-    ){
-        $this->scopeConfig = $scopeConfig;
-        $this->logger = $logger;
-        $this->addressLineHelper = $addressLineHelper;
+        protected ScopeConfigInterface $scopeConfig,
+        protected LoggerInterface $logger,
+        protected Data $addressLineHelper
+    ) {
     }
 
-    public function process($result){
-
-        if(!$this->addressLineHelper->getModuleConfig('enabled')) {
-            return $result;
+    /**
+     * @inheritdoc
+     */
+    public function process($jsLayout)
+    {
+        if (!$this->addressLineHelper->getModuleConfig('enabled')) {
+            return $jsLayout;
         }
 
-        if(isset($result['components']['checkout']['children']['steps']['children']
-            ['shipping-step']['children']['shippingAddress']['children']
-            ['shipping-address-fieldset'])) {
-
-            $shippingFields = $result['components']['checkout']['children']['steps']['children']
-            ['shipping-step']['children']['shippingAddress']['children']
-            ['shipping-address-fieldset']['children'];
+        if (isset($jsLayout['components']['checkout']
+            ['children']['steps']
+            ['children']['shipping-step']
+            ['children']['shippingAddress']
+            ['children']['shipping-address-fieldset'])
+        ) {
+            $shippingFields = $jsLayout['components']['checkout']
+            ['children']['steps']
+            ['children']['shipping-step']
+            ['children']['shippingAddress']
+            ['children']['shipping-address-fieldset']
+            ['children'];
 
             $shippingFields = $this->modifyStreetUiComponents($shippingFields);
 
-            $result['components']['checkout']['children']['steps']['children']
-            ['shipping-step']['children']['shippingAddress']['children']
-            ['shipping-address-fieldset']['children'] = $shippingFields;
+            $jsLayout['components']['checkout']
+            ['children']['steps']
+            ['children']['shipping-step']
+            ['children']['shippingAddress']
+            ['children']['shipping-address-fieldset']
+            ['children'] = $shippingFields;
 
         }
 
-        $result = $this->getBillingFormFields($result);
+        $jsLayout = $this->getBillingFormFields($jsLayout);
 
-        return $result;
+        return $jsLayout;
     }
 
-
-    public function getBillingFormFields($result){
-
-        if(isset($result['components']['checkout']['children']['steps']['children']
-            ['billing-step']['children']['payment']['children']
-            ['payments-list'])) {
-
-            $paymentForms = $result['components']['checkout']['children']['steps']['children']
-            ['billing-step']['children']['payment']['children']
-            ['payments-list']['children'];
-
-            foreach ($paymentForms as $paymentMethodForm => $paymentMethodValue) {
-
+    /**
+     * @param $jsLayout
+     * @return array
+     */
+    public function getBillingFormFields($jsLayout)
+    {
+        if (isset($jsLayout['components']['checkout']
+            ['children']['steps']
+            ['children']['billing-step']
+            ['children']['payment']
+            ['children']['payments-list'])
+        ) {
+            $paymentForms = $jsLayout['components']['checkout']
+            ['children']['steps']
+            ['children']['billing-step']
+            ['children']['payment']
+            ['children']['payments-list']
+            ['children'];
+
+            foreach (array_keys($paymentForms) as $paymentMethodForm) {
                 $paymentMethodCode = str_replace('-form', '', $paymentMethodForm);
 
-                if (!isset($result['components']['checkout']['children']['steps']['children']['billing-step']['children']['payment']['children']['payments-list']['children'][$paymentMethodCode . '-form'])) {
+                if (!isset($jsLayout['components']['checkout']
+                    ['children']['steps']
+                    ['children']['billing-step']
+                    ['children']['payment']
+                    ['children']['payments-list']
+                    ['children'][$paymentMethodCode . '-form'])
+                ) {
                     continue;
                 }
 
-                $billingFields = $result['components']['checkout']['children']['steps']['children']
-                ['billing-step']['children']['payment']['children']
-                ['payments-list']['children'][$paymentMethodCode . '-form']['children']['form-fields']['children'];
+                $billingFields = $jsLayout['components']['checkout']
+                ['children']['steps']
+                ['children']['billing-step']
+                ['children']['payment']
+                ['children']['payments-list']
+                ['children'][$paymentMethodCode . '-form']
+                ['children']['form-fields']
+                ['children'];
 
                 $billingFields = $this->modifyStreetUiComponents($billingFields);
 
-                $result['components']['checkout']['children']['steps']['children']
-                ['billing-step']['children']['payment']['children']
-                ['payments-list']['children'][$paymentMethodCode . '-form']['children']['form-fields']['children'] = $billingFields;
-
+                $jsLayout['components']['checkout']
+                ['children']['steps']
+                ['children']['billing-step']
+                ['children']['payment']
+                ['children']['payments-list']
+                ['children'][$paymentMethodCode . '-form']
+                ['children']['form-fields']
+                ['children'] = $billingFields;
             }
         }
 
-        return $result;
-
+        return $jsLayout;
     }
 
+    /**
+     * @param $addressResult
+     * @return array
+     */
     public function modifyStreetUiComponents($addressResult)
     {
-        if(isset($addressResult['street']['label'])){
+        if (isset($addressResult['street']['label'])) {
             unset($addressResult['street']['label']);
             unset($addressResult['street']['required']);
         }
 
-        if(isset($addressResult['street'])){
+        if (isset($addressResult['street'])) {
             unset($addressResult['street']['children'][1]['validation']);
             unset($addressResult['street']['children'][2]['validation']);
         }
 
-        if(isset($addressResult['street']['config']['template'])) {
+        if (isset($addressResult['street']['config']['template'])) {
             $addressResult['street']['config']['template'] = 'Experius_AddressLines/group/group';
         }
 
-        if(isset($addressResult['street']['config']['additionalClasses'])) {
-            $addressResult['street']['config']['additionalClasses'] = $addressResult['street']['config']['additionalClasses'] . ' experius-address-lines';
+        if (isset($addressResult['street']['config']['additionalClasses'])) {
+            $addressResult['street']['config']['additionalClasses'] =
+                $addressResult['street']['config']['additionalClasses'] . ' experius-address-lines';
         }
 
         $lineCount = 0;
 
-        while($lineCount < 4){
- 
-            $lineNumber = $lineCount+1;
+        while ($lineCount < 4) {
 
-            if(isset($addressResult['street']['children'][$lineCount])){
+            $lineNumber = $lineCount + 1;
+
+            if (isset($addressResult['street']['children'][$lineCount])) {
                 $label = $this->addressLineHelper->getLineLabel($lineNumber);
-                
-                if ( $this->addressLineHelper->isLineEnabled($lineNumber)) {
+
+                if ($this->addressLineHelper->isLineEnabled($lineNumber)) {
                     $addressResult['street']['children'][$lineCount]['label'] = $label;
                     $addressResult['street']['children'][$lineCount]['additionalClasses'] = 'experius-address-line-one';
-                    $addressResult['street']['children'][$lineCount]['validation'] = $this->addressLineHelper->getValidationClassesAsArrayForLine($lineNumber);
-                    $addressResult['street']['children'][$lineCount]['required'] = ($this->addressLineHelper->isLineRequired($lineNumber)) ? True : False;
+                    $addressResult['street']['children'][$lineCount]['validation'] =
+                        $this->addressLineHelper->getValidationClassesAsArrayForLine($lineNumber);
+                    $addressResult['street']['children'][$lineCount]['required'] =
+                        (bool)$this->addressLineHelper->isLineRequired($lineNumber);
                 }
             }
 
@@ -125,6 +170,4 @@ public function modifyStreetUiComponents($addressResult)
 
         return $addressResult;
     }
-
-
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..6e77341
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,99 @@
+## 1.3.0 (2023-10-27)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.3.0)
+
+*  [FEATURE][IN23-253] Update module to be compatible with Magento 2.4.6-p3 and PHP 8.2 *(Boris van Katwijk)*
+
+
+## 1.2.8 (2023-04-24)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.2.8)
+
+*  Fix for PHP 8.1 *(Peter Jaap Blaakmeer)*
+
+
+## 1.2.7 (2017-11-30)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.2.7)
+
+*  Added form_key to create account form *(Experius)*
+
+
+## 1.2.6 (2017-09-04)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.2.6)
+
+*  [BUGFIX] Solved error that occurred if config validation was left empty *(bartlubbersen)*
+
+
+## 1.2.5 (2017-07-04)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.2.5)
+
+*  [TASK] Added required validation and check if isUsedInForm for the Customer Address Edit Form *(Lewis Voncken)*
+
+
+## 1.2.4 (2017-07-04)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.2.4)
+
+*  [TASK] Added Required Label based on attribute is required-entry class *(Lewis Voncken)*
+
+
+## 1.2.3 (2017-07-03)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.2.3)
+
+*  [TASK] Added isUsedInForm to check if Address Fields telephone and company is used in Registration form *(Lewis Voncken)*
+*  [BUGFIX] custom street group.html template to fix layout issues on blank. Fixed issued where current additional classes where replaced instead of added *(Derrick Heesbeen)*
+
+
+## 1.2.2 (2017-05-05)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.2.2)
+
+*  [BUGFIX] Solved problem with check of enabled and required function *(Lewis Voncken)*
+*  [BUGFIX] added missing character *(Lewis Voncken)*
+
+
+## 1.2.1 (2017-05-02)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.2.1)
+
+*  [FEATURE] Added AddressLine Support to the Registration and AddressEdit form *(Lewis Voncken)*
+
+
+## 1.0.1 (2017-01-26)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.0.1)
+
+
+
+## 1.1.0 (2017-01-26)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.1.0)
+
+
+
+## 1.2.0 (2017-01-26)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.2.0)
+
+*  added license *(Derrick Heesbeen)*
+*  changed module name *(Derrick Heesbeen)*
+*  Add files via upload *(robbertstevens)*
+*  Correct composer.json according to Magento standards *(bartlubbersen)*
+*  Resolved error when compiling *(Tjitse-E)*
+
+
+## 1.0.0 (2016-11-09)
+
+[View Release](git@github.com:experius/Magento-2-Module-Experius-Address-Lines.git/commits/tag/1.0.0)
+
+*  First Commit *(Derrick Heesbeen)*
+*  Added configuration *(Derrick Heesbeen)*
+*  screenshots for readme *(Derrick Heesbeen)*
+*  Update README.md *(Derrick Heesbeen)*
+*  Update README.md *(Derrick Heesbeen)*
+
+
diff --git a/COPYING.txt b/COPYING.txt
new file mode 100644
index 0000000..9580858
--- /dev/null
+++ b/COPYING.txt
@@ -0,0 +1,6 @@
+Copyright © 2023-present Happy Horizon Utrecht Development & Technology B.V.
+
+This file included in Experius/AddressLines is licensed under OSL 3.0
+
+http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+Please see LICENSE.txt for the full text of the OSL 3.0 license
\ No newline at end of file
diff --git a/Helper/Data.php b/Helper/Data.php
index 553104d..23a262a 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -1,127 +1,144 @@
 <?php
+/**
+ * Copyright © Happy Horizon Utrecht Development & Technology B.V. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
 namespace Experius\AddressLines\Helper;
 
-use Magento\Framework\App\ResourceConnection;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute;
+use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Store\Model\ScopeInterface;
 
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
+class Data extends AbstractHelper
 {
-    protected $resource;
-
-    protected $eavAttribute;
-
-    public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        ResourceConnection $resourceConnection,
-        Attribute $eavAttribute
-    ) {
-        $this->resource = $resourceConnection;
-        $this->eavAttribute = $eavAttribute;
-        parent::__construct($context);
+    /**
+     * @param $field
+     * @param $group
+     * @param $section
+     * @return mixed|string
+     */
+    public function getModuleConfig($field = null, $group = null, $section = null)
+    {
+        $section = $section ?: 'customer';
+        $group = $group ?: 'experius_address_lines';
+        $field = $field ?: 'enabled';
+        return $this->scopeConfig->getValue("{$section}/{$group}/{$field}", ScopeInterface::SCOPE_STORE) ?? '';
     }
-    public function getModuleConfig($field = false, $group = false, $section = false)
+
+    /**
+     * @param $field
+     * @param $group
+     * @param $section
+     * @return bool
+     */
+    public function isSetFlag($field = null, $group = null, $section = null): bool
     {
-        $section = ($section) ? $section : 'customer';
-        $group = ($group) ?  $group : 'experius_address_lines';
-        $field = ($field) ? $field : 'enabled';
-        //var_dump("{$section}/{$group}/{$field}"); exit();die();
-        return $this->scopeConfig->getValue("{$section}/{$group}/{$field}", \Magento\Store\Model\ScopeInterface::SCOPE_STORE) ?? '';
+        $section = $section ?: 'customer';
+        $group = $group ?: 'experius_address_lines';
+        $field = $field ?: 'enabled';
+        return $this->scopeConfig->isSetFlag("{$section}/{$group}/{$field}", ScopeInterface::SCOPE_STORE);
     }
 
-    public function isLineEnabled($lineNumber)
+    /**
+     * @param $lineNumber
+     * @return bool
+     */
+    public function isLineEnabled($lineNumber): bool
     {
         $group = "experius_address_lines/experius_address_line{$lineNumber}";
-        return $this->getModuleConfig("line_enabled", $group);
+        return $this->isSetFlag('line_enabled', $group);
     }
 
+    /**
+     * @param $lineNumber
+     * @return \Magento\Framework\Phrase|mixed|string
+     */
     public function getLineLabel($lineNumber)
     {
         $group = "experius_address_lines/experius_address_line{$lineNumber}";
-        $label = ($this->getModuleConfig("line_label", $group))
-            ? $this->getModuleConfig("line_label", $group)
+        $label = ($this->getModuleConfig('line_label', $group))
+            ? $this->getModuleConfig('line_label', $group)
             : __('Address Line');
         return $label;
     }
 
+    /**
+     * @param $lineNumber
+     * @return false|mixed|string
+     */
     public function getValidationMaxLength($lineNumber)
     {
         $group = "experius_address_lines/experius_address_line{$lineNumber}";
-        $maxLength = ($this->getModuleConfig("line_max_length", $group))
-            ? $this->getModuleConfig("line_max_length", $group)
+        $maxLength = ($this->getModuleConfig('line_max_length', $group))
+            ? $this->getModuleConfig('line_max_length', $group)
             : false;
         return $maxLength;
     }
 
+    /**
+     * @param $lineNumber
+     * @return false|mixed|string
+     */
     public function getValidationMinLength($lineNumber)
     {
         $group = "experius_address_lines/experius_address_line{$lineNumber}";
-        $maxLength = ($this->getModuleConfig("line_min_length", $group))
-            ? $this->getModuleConfig("line_min_length", $group)
+        $maxLength = ($this->getModuleConfig('line_min_length', $group))
+            ? $this->getModuleConfig('line_min_length', $group)
             : false;
         return $maxLength;
     }
 
-    public function isLineRequired($lineNumber)
+    /**
+     * @param $lineNumber
+     * @return bool
+     */
+    public function isLineRequired($lineNumber): bool
     {
         $group = "experius_address_lines/experius_address_line{$lineNumber}";
-        return $this->getModuleConfig("line_required", $group);
+        return $this->isSetFlag('line_required', $group);
     }
 
-    public function getValidationClassesForLine($lineNumber)
+    /**
+     * @param $lineNumber
+     * @return string
+     */
+    public function getValidationClassesForLine($lineNumber): string
     {
         if (!$this->getValidationClassesAsArrayForLine($lineNumber)) {
-            return;
+            return '';
         }
         $validationArray = $this->getValidationClassesAsArrayForLine($lineNumber);
-        if (key_exists('validate-number',$validationArray)) {
+        if (key_exists('validate-number', $validationArray)) {
             $validationArray['validate-digits'] = 1;
             unset($validationArray['validate-number']);
         }
-        $validationClassesString = ' ' . implode(' ', array_keys($validationArray));
-        return $validationClassesString;
+        return ' ' . implode(' ', array_keys($validationArray));
     }
 
-    public function getValidationClassesAsArrayForLine($lineNumber) 
+    /**
+     * @param $lineNumber
+     * @return array
+     */
+    public function getValidationClassesAsArrayForLine($lineNumber): array
     {
         $group = "experius_address_lines/experius_address_line{$lineNumber}";
 
-        $validationClassesString = $this->getModuleConfig("line_validation_classes", $group);
-        //var_dump($validationClassesString);
+        $validationClassesString = $this->getModuleConfig('line_validation_classes', $group);
         $validationParts = explode(',', $validationClassesString);
-        //var_dump($validationParts); die();
         $validationClassesArray = [];
-        foreach($validationParts as $validationPart) {
+        foreach ($validationParts as $validationPart) {
             if (!$validationPart) {
                 continue;
             }
             $validationPartArray = explode(':', $validationPart);
             if (!empty($validationPartArray)) {
-                $validationClassesArray[$validationPartArray[0]] = (int) $validationPartArray[1];
+                $validationClassesArray[$validationPartArray[0]] = (int)$validationPartArray[1];
             }
         }
-        if($this->isLineRequired($lineNumber)){
+        if ($this->isLineRequired($lineNumber)) {
             $validationClassesArray['required-entry'] = 1;
         }
         return $validationClassesArray;
     }
-
-    /**
-     * Return form attribute IDs by form code
-     *
-     * @param string $formCode
-     * @return array
-     */
-    public function isUsedInForm($attributeCode, $formCode = 'customer_register_address', $entityType = \Magento\Customer\Api\AddressMetadataInterface::ENTITY_TYPE_ADDRESS)
-    {
-        $attributeId = $this->eavAttribute->getIdByCode( $entityType, $attributeCode);
-        $bind = ['attribute_id' => $attributeId, 'form_code' => $formCode];
-        $select = $this->resource->getConnection()->select()->from(
-            $this->resource->getTableName('customer_form_attribute'),
-            'attribute_id'
-        )->where(
-             'attribute_id = :attribute_id AND form_code = :form_code'
-        );
-        return $this->resource->getConnection()->fetchRow($select, $bind);
-    }
-
 }
diff --git a/README.md b/README.md
index da1a816..529149e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-**Experius Address Lines,**
+# Experius Address Lines
 
-Adds labels to address lines and adds configuration per address line.
+Add labels to address lines and configuration for each address line.
 
 Configuration Per Line
 
diff --git a/composer.json b/composer.json
index 3265cce..a45871d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,20 +1,28 @@
 {
-  "name": "experius/module-addresslines",
-  "description": "",
-  "authors": [
-    {
-      "name": "Mage2Gen",
-      "email": "info@mage2gen.com"
-    }
-  ],
-  "minimum-stability": "dev",
-  "require": {},
-  "autoload": {
-    "files": [
-      "registration.php"
+    "name": "experius/module-addresslines",
+    "description": "Add labels to address lines and configuration for each address line.",
+    "type": "magento2-module",
+    "license": "OSL-3.0",
+    "authors": [
+        {
+            "name": "Mage2Gen",
+            "email": "info@mage2gen.com"
+        },
+        {
+            "name": "Boris van Katwijk",
+            "email": "borisvankatwijk@happyhorizon.com"
+        }
     ],
-    "psr-4": {
-      "Experius\\AddressLines\\": ""
+    "minimum-stability": "dev",
+    "require": {
+        "php": ">=8.1"
+    },
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Experius\\AddressLines\\": ""
+        }
     }
-  }
 }
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 0b717d7..56e345b 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -6,7 +6,7 @@
             <group id="experius_address_lines" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="900" translate="label">
                 <label>Address Lines</label>
                 <field id="enabled" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label" type="select">
-                    <label>enabled</label>
+                    <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <group id="experius_address_line1" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="900" translate="label">
@@ -33,7 +33,7 @@
                 <group id="experius_address_line2" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="900" translate="label">
                     <label>Line 2</label>
                     <field id="line_enabled" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="5" translate="label" type="select">
-                        <label>enabled</label>
+                        <label>Enabled</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     </field>
                     <field id="line_required" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label" type="select">
@@ -58,7 +58,7 @@
                 <group id="experius_address_line3" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="900" translate="label">
                     <label>Line 3</label>
                     <field id="line_enabled" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="5" translate="label" type="select">
-                        <label>enabled</label>
+                        <label>Enabled</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     </field>
                     <field id="line_required" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label" type="select">
@@ -83,7 +83,7 @@
                 <group id="experius_address_line4" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="900" translate="label">
                     <label>Line 4</label>
                     <field id="line_enabled" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="5" translate="label" type="select">
-                        <label>enabled</label>
+                        <label>Enabled</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     </field>
                     <field id="line_required" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label" type="select">
@@ -108,4 +108,4 @@
             </group>
         </section>
     </system>
-</config>
\ No newline at end of file
+</config>
diff --git a/etc/config.xml b/etc/config.xml
index 6018499..4dae637 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -27,11 +27,11 @@
                 </experius_address_line3>
                 <experius_address_line4>
                     <line_enabled>0</line_enabled>
-                    <line_label></line_label>
-                    <line_required></line_required>
-                    <line_validation_classes></line_validation_classes>
+                    <line_label/>
+                    <line_required/>
+                    <line_validation_classes/>
                 </experius_address_line4>
             </experius_address_lines>
         </customer>
     </default>
-</config>
\ No newline at end of file
+</config>
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index cd48629..13a52b5 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -7,4 +7,4 @@
             </argument>
         </arguments>
     </type>
-</config>
\ No newline at end of file
+</config>
diff --git a/etc/module.xml b/etc/module.xml
index a65de37..ae7465b 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Experius_AddressLines" setup_version="1.0.0">
+    <module name="Experius_AddressLines">
         <sequence>
             <module name="Magento_Checkout"/>
+            <module name="Magento_Config"/>
             <module name="Magento_Customer"/>
-            <module name="Magento_CustomerCustomAttributes"/>
+            <module name="Magento_Directory"/>
+            <module name="Magento_Framework"/>
+            <module name="Magento_Store"/>
         </sequence>
     </module>
 </config>
diff --git a/i18n/en_US.csv b/i18n/en_US.csv
deleted file mode 100644
index ab9521c..0000000
--- a/i18n/en_US.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-Street,Street
-Housenumber,Housenumber
-Addition,Addition
-"Address Lines","Address Lines"
-enabled,enabled
diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv
deleted file mode 100644
index ab9521c..0000000
--- a/i18n/nl_NL.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-Street,Street
-Housenumber,Housenumber
-Addition,Addition
-"Address Lines","Address Lines"
-enabled,enabled
diff --git a/registration.php b/registration.php
index 2e14acf..bc60ce4 100644
--- a/registration.php
+++ b/registration.php
@@ -1,6 +1,9 @@
 <?php
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Experius_AddressLines',
-    __DIR__
-);
\ No newline at end of file
+/**
+ * Copyright © Happy Horizon Utrecht Development & Technology B.V. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Experius_AddressLines', __DIR__);
+
diff --git a/view/frontend/layout/customer_account_create.xml b/view/frontend/layout/customer_account_create.xml
index 93932f2..7c3875c 100755
--- a/view/frontend/layout/customer_account_create.xml
+++ b/view/frontend/layout/customer_account_create.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Happy Horizon Utrecht Development & Technology B.V. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
@@ -10,7 +10,7 @@
     <body>
         <referenceBlock name="customer_form_register">
             <action method="setTemplate" ifconfig="customer/experius_address_lines/enabled">
-                <argument name="template" xsi:type="string">Experius_AddressLines::/experius/customer/form/register.phtml</argument>
+                <argument name="template" xsi:type="string">Experius_AddressLines::experius/customer/form/register.phtml</argument>
             </action>
         </referenceBlock>
     </body>
diff --git a/view/frontend/layout/customer_address_form.xml b/view/frontend/layout/customer_address_form.xml
index d0a06c1..1679a71 100755
--- a/view/frontend/layout/customer_address_form.xml
+++ b/view/frontend/layout/customer_address_form.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Happy Horizon Utrecht Development & Technology B.V. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
@@ -10,7 +10,7 @@
     <body>
         <referenceBlock name="customer_address_edit">
             <action method="setTemplate"  ifconfig="customer/experius_address_lines/enabled">
-                <argument name="template" xsi:type="string">Experius_AddressLines::/experius/customer/address/edit.phtml</argument>
+                <argument name="template" xsi:type="string">Experius_AddressLines::experius/customer/address/edit.phtml</argument>
             </action>
         </referenceBlock>
     </body>
diff --git a/view/frontend/templates/experius/customer/address/edit.phtml b/view/frontend/templates/experius/customer/address/edit.phtml
index 8a7d5be..a132b6f 100644
--- a/view/frontend/templates/experius/customer/address/edit.phtml
+++ b/view/frontend/templates/experius/customer/address/edit.phtml
@@ -1,78 +1,109 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Happy Horizon Utrecht Development & Technology B.V. All rights reserved.
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var \Magento\Customer\Block\Address\Edit $block */
+/** @var \Magento\Customer\ViewModel\Address $viewModel */
+/** @var \Magento\Framework\Escaper $escaper */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/** @var \Magento\Customer\ViewModel\Address\RegionProvider $regionProvider */
+$viewModel = $block->getViewModel();
+$regionProvider = $block->getRegionProvider();
+/** @var \Experius\AddressLines\Helper\Data $experiusAddressLinesHelper */
+$experiusAddressLinesHelper = $this->helper('Experius\AddressLines\Helper\Data');
 ?>
-<?php
-/**
- * Edit customer address template
- *
- * @var $block \Magento\Customer\Block\Address\Edit
- */
+<?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
+<?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
+<?php $_fax = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Fax::class) ?>
+<?php $_country_id = $block->getAttributeData()->getFrontendLabel('country_id'); ?>
+<?php $_street = $block->getAttributeData()->getFrontendLabel('street'); ?>
+<?php $_city = $block->getAttributeData()->getFrontendLabel('city'); ?>
+<?php $_region = $block->getAttributeData()->getFrontendLabel('region'); ?>
+<?php $_selectRegion = 'Please select a region, state or province.'; ?>
+<?php $_displayAll = $block->getConfig('general/region/display_all'); ?>
+
+<?php $_vatidValidationClass = $viewModel->addressGetAttributeValidationClass('vat_id'); ?>
+<?php $_cityValidationClass = $viewModel->addressGetAttributeValidationClass('city'); ?>
+<?php $_postcodeValidationClass_value = $viewModel->addressGetAttributeValidationClass('postcode'); ?>
+<?php $_postcodeValidationClass = $_postcodeValidationClass_value; ?>
+<?php $_streetValidationClass = $viewModel->addressGetAttributeValidationClass('street'); ?>
+<?php $_streetValidationClassNotRequired = $_streetValidationClass !== null ?
+    trim(str_replace('required-entry', '', $_streetValidationClass)) : '';
+$_updatedStreetValidationClass = $_streetValidationClass . $experiusAddressLinesHelper->getValidationClassesForLine(1);
+$maxLength = $experiusAddressLinesHelper->getValidationMaxLength(1);
+$minLength = $experiusAddressLinesHelper->getValidationMinLength(1);
 ?>
-<form class="form-address-edit" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="form-validate" enctype="multipart/form-data" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
+<?php $_regionValidationClass = $viewModel->addressGetAttributeValidationClass('region'); ?>
+<form class="form-address-edit"
+      action="<?= $escaper->escapeUrl($block->getSaveUrl()) ?>"
+      method="post"
+      id="form-validate"
+      enctype="multipart/form-data"
+      data-hasrequired="<?= $escaper->escapeHtmlAttr(__('* Required Fields')) ?>">
     <fieldset class="fieldset">
-        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Contact Information') ?></span></legend><br>
-        <?php echo $block->getBlockHtml('formkey')?>
-        <input type="hidden" name="success_url" value="<?php /* @escapeNotVerified */ echo $block->getSuccessUrl() ?>"/>
-        <input type="hidden" name="error_url" value="<?php /* @escapeNotVerified */ echo $block->getErrorUrl() ?>"/>
-        <?php echo $block->getNameBlockHtml() ?>
-        <?php if ($this->helper('Experius\AddressLines\Helper\Data')->isUsedInForm('company')): ?>
-            <?php $attributeValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company'); ?>
-            <div class="field company<?php echo (strpos($attributeValidationClass, 'required-entry')) ? ' required' : '' ?>">
-                <label class="label" for="company"><span><?php /* @escapeNotVerified */ echo __('Company') ?></span></label>
-                <div class="control">
-                    <input type="text" name="company" id="company" title="<?php /* @escapeNotVerified */ echo __('Company') ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getCompany()) ?>" class="input-text <?php /* @escapeNotVerified */ echo $attributeValidationClass ?>"/>
-                </div>
-            </div>
-        <?php endif; ?>
-        <?php if ($this->helper('Experius\AddressLines\Helper\Data')->isUsedInForm('telephone')): ?>
-            <?php $attributeValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone'); ?>
-            <div class="field telephone<?php echo (strpos($attributeValidationClass, 'required-entry')) ? ' required' : '' ?>">
-                <label class="label" for="telephone"><span><?php /* @escapeNotVerified */ echo __('Phone Number') ?></span></label>
-                <div class="control">
-                    <input type="text" name="telephone" value="<?php echo $block->escapeHtml($block->getAddress()->getTelephone()) ?>" title="<?php /* @escapeNotVerified */ echo __('Phone Number') ?>" class="input-text <?php /* @escapeNotVerified */ echo $attributeValidationClass ?>" id="telephone"/>
-                </div>
-            </div>
-        <?php endif; ?>
-        <div class="field fax">
-            <label class="label" for="fax"><span><?php /* @escapeNotVerified */ echo __('Fax') ?></span></label>
-            <div class="control">
-                <input type="text" name="fax" id="fax" title="<?php /* @escapeNotVerified */ echo __('Fax') ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getFax()) ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>"/>
-            </div>
-        </div>
+        <legend class="legend"><span><?= $escaper->escapeHtml(__('Contact Information')) ?></span></legend><br>
+        <?= $block->getBlockHtml('formkey') ?>
+        <input type="hidden" name="success_url" value="<?= $escaper->escapeUrl($block->getSuccessUrl()) ?>">
+        <input type="hidden" name="error_url" value="<?= $escaper->escapeUrl($block->getErrorUrl()) ?>">
+        <?= $block->getNameBlockHtml() ?>
+
+        <?php if ($_company->isEnabled()): ?>
+            <?= $_company->setCompany($block->getAddress()->getCompany())->toHtml() ?>
+        <?php endif ?>
+
+        <?php if ($_telephone->isEnabled()): ?>
+            <?= $_telephone->setTelephone($block->getAddress()->getTelephone())->toHtml() ?>
+        <?php endif ?>
+
+        <?php if ($_fax->isEnabled()): ?>
+            <?= $_fax->setFax($block->getAddress()->getFax())->toHtml() ?>
+        <?php endif ?>
+
     </fieldset>
     <fieldset class="fieldset">
-        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Address') ?></span></legend><br>
-        <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-        <?php $_i = 1; ?>
-        <?php if ($this->helper('Experius\AddressLines\Helper\Data')->getValidationClassesForLine($_i)): ?>
-            <?php $_streetValidationClass .= $this->helper('Experius\AddressLines\Helper\Data')->getValidationClassesForLine($_i); ?>
-        <?php endif; ?>
+        <legend class="legend"><span><?= $escaper->escapeHtml(__('Address')) ?></span></legend><br>
         <div class="field street required">
-            <label for="street" class="label"><span><?php /* @escapeNotVerified */ echo __('Street Address') ?></span></label>
+            <label for="street_1" class="label"><span><?= /* @noEscape */ $_street ?></span></label>
             <div class="control">
-                <label class="label" for="street_<?php /* @escapeNotVerified */ echo $_i ?>">
-                    <span><?php /* @escapeNotVerified */ echo $this->helper('Experius\AddressLines\Helper\Data')->getLineLabel($_i) ?></span>
-                </label>
-                <input type="text" name="street[1]" value="<?php echo $block->escapeHtml($block->getStreetLine($_i)) ?>" title="<?php /* @escapeNotVerified */ echo __('Street Address') ?>" id="street_1" class="input-text <?php /* @escapeNotVerified */ echo $_streetValidationClass ?>">
+                <div class="field primary">
+                    <label for="street_1" class="label">
+                        <span>
+                            <?= $escaper->escapeHtmlAttr($experiusAddressLinesHelper->getLineLabel(1)) ?>
+                        </span>
+                    </label>
+                </div>
+                <input type="text"
+                       name="street[0]"
+                       value="<?= $escaper->escapeHtmlAttr($block->getStreetLine(1)) ?>"
+                       title="<?= /* @noEscape */ $_street ?>"
+                       id="street_1"
+                       class="input-text <?= $escaper->escapeHtmlAttr($_updatedStreetValidationClass) ?>"
+                    <?= $maxLength ? 'maxlength="' . $maxLength . '"' : ''; ?>
+                    <?= $minLength ? 'minlength="' . $minLength . '"' : ''; ?>
+                >
                 <div class="nested">
-                    <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
-                        <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-                        <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
-                        <?php if ($this->helper('Experius\AddressLines\Helper\Data')->getValidationClassesForLine($_i)): ?>
-                            <?php $_streetValidationClass .= $this->helper('Experius\AddressLines\Helper\Data')->getValidationClassesForLine($_i); ?>
-                        <?php endif; ?>
-                        <div class="field">
-                            <label class="label" for="street_<?php /* @escapeNotVerified */ echo $_i ?>">
-                                <span><?php /* @escapeNotVerified */ echo $this->helper('Experius\AddressLines\Helper\Data')->getLineLabel($_i) ?></span>
+                    <?php for ($_i = 1, $_n = $viewModel->addressGetStreetLines(); $_i < $_n; $_i++): ?>
+                        <?php
+                        $_updatedStreetValidationClass = $escaper->escapeHtmlAttr($_streetValidationClassNotRequired);
+                        $_updatedStreetValidationClass .= $escaper->escapeHtmlAttr($experiusAddressLinesHelper->getValidationClassesForLine($_i + 1));
+                        $maxLength = $experiusAddressLinesHelper->getValidationMaxLength($_i + 1);
+                        $minLength = $experiusAddressLinesHelper->getValidationMinLength($_i + 1);
+                        ?>
+                        <div class="field additional">
+                            <label class="label" for="street_<?= /* @noEscape */ $_i + 1 ?>">
+                                <span><?= $escaper->escapeHtml(__('Street Address: Line %1', $_i + 1)) ?></span>
                             </label>
                             <div class="control">
-                                <input type="text" value="<?php echo $block->escapeHtml($block->getStreetLine($_i)) ?>" name="street[<?php echo $_i; ?>]" <?php if ($this->helper('Experius\AddressLines\Helper\Data')->getValidationMaxLength($_i)) { echo 'maxlength="' . $this->helper('Experius\AddressLines\Helper\Data')->getValidationMaxLength($_i) . '"' ; } ?> <?php if ($this->helper('Experius\AddressLines\Helper\Data')->getValidationMinLength($_i)) { echo 'minlength="' . $this->helper('Experius\AddressLines\Helper\Data')->getValidationMinLength($_i) . '"' ; } ?> title="<?php /* @escapeNotVerified */ echo $this->helper('Experius\AddressLines\Helper\Data')->getLineLabel($_i) ?>" id="street_<?php /* @escapeNotVerified */ echo $_i ?>" class="input-text <?php /* @escapeNotVerified */ echo $_streetValidationClass ?>">
+                                <input type="text" name="street[<?= /* @noEscape */ $_i ?>]"
+                                       value="<?= $escaper->escapeHtmlAttr($block->getStreetLine($_i + 1)) ?>"
+                                       title="<?= $escaper->escapeHtmlAttr($experiusAddressLinesHelper->getLineLabel($_i + 1)) ?>"
+                                       id="street_<?= /* @noEscape */ $_i + 1 ?>"
+                                       class="input-text <?= $_updatedStreetValidationClass ?>"
+                                    <?= $maxLength ? 'maxlength="' . $maxLength . '"' : ''; ?>
+                                    <?= $minLength ? 'minlength="' . $minLength . '"' : ''; ?>
+                                >
                             </div>
                         </div>
                     <?php endfor; ?>
@@ -80,81 +111,125 @@
             </div>
         </div>
 
-        <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
-        <div class="field taxvat">
-            <label class="label" for="vat_id"><span><?php /* @escapeNotVerified */ echo __('VAT Number') ?></span></label>
-            <div class="control">
-                <input type="text" name="vat_id" value="<?php echo $block->escapeHtml($block->getAddress()->getVatId()) ?>" title="<?php /* @escapeNotVerified */ echo __('VAT Number') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" id="vat_id"/>
+        <?php if ($viewModel->addressIsVatAttributeVisible()): ?>
+            <div class="field taxvat">
+                <label class="label" for="vat_id">
+                    <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?></span>
+                </label>
+                <div class="control">
+                    <input type="text"
+                           name="vat_id"
+                           value="<?= $escaper->escapeHtmlAttr($block->getAddress()->getVatId()) ?>"
+                           title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?>"
+                           class="input-text <?= $escaper->escapeHtmlAttr($_vatidValidationClass) ?>"
+                           id="vat_id">
+                </div>
             </div>
-        </div>
         <?php endif; ?>
-        <div class="field city required">
-            <label class="label" for="city"><span><?php /* @escapeNotVerified */ echo __('City') ?></span></label>
+        <div class="field country required">
+            <label class="label" for="country">
+                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('country_id') ?></span>
+            </label>
             <div class="control">
-                <input type="text" name="city" value="<?php echo $block->escapeHtml($block->getAddress()->getCity()) ?>" title="<?php /* @escapeNotVerified */ echo __('City') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city"/>
+                <?= $block->getCountryHtmlSelect() ?>
             </div>
         </div>
         <div class="field region required">
-            <label class="label" for="region_id"><span><?php /* @escapeNotVerified */ echo __('State/Province') ?></span></label>
+            <label class="label" for="region_id">
+                <span><?= /* @noEscape */ $_region ?></span>
+            </label>
             <div class="control">
-                <select id="region_id" name="region_id" title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="validate-select" <?php echo(!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : '';?>>
-                   <option value=""><?php /* @escapeNotVerified */ echo __('Please select a region, state or province.') ?></option>
+                <select id="region_id" name="region_id"
+                        title="<?= /* @noEscape */ $_region ?>"
+                        class="validate-select region_id"
+                        <?= /* @noEscape */ !$_displayAll ? ' disabled="disabled"' : '' ?>>
+                    <option value=""><?= $escaper->escapeHtml(__($_selectRegion)) ?></option>
                 </select>
-                <input type="text" id="region" name="region" value="<?php echo $block->escapeHtml($block->getRegion()) ?>"  title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>"<?php echo(!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : '';?>/>
+                <input type="text"
+                       id="region"
+                       name="region"
+                       value="<?= $escaper->escapeHtmlAttr($block->getRegion()) ?>"
+                       title="<?= /* @noEscape */ $_region ?>"
+                       class="input-text validate-not-number-first
+                        <?= $escaper->escapeHtmlAttr($_regionValidationClass) ?>"
+                        <?= !$_displayAll ? ' disabled="disabled"' : '' ?>>
             </div>
         </div>
-        <div class="field zip required">
-            <label class="label" for="zip"><span><?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?></span></label>
+        <div class="field city required">
+            <label class="label" for="city">
+                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span>
+            </label>
             <div class="control">
-                <input type="text" name="postcode" value="<?php echo $block->escapeHtml($block->getAddress()->getPostcode()) ?>" title="<?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>"/>
+                <input type="text"
+                       name="city"
+                       value="<?= $escaper->escapeHtmlAttr($block->getAddress()->getCity()) ?>"
+                       title="<?= $escaper->escapeHtmlAttr(__('City')) ?>"
+                       class="input-text <?= $escaper->escapeHtmlAttr($_cityValidationClass) ?>"
+                       id="city">
             </div>
         </div>
-        <div class="field country required">
-            <label class="label" for="country"><span><?php /* @escapeNotVerified */ echo __('Country') ?></span></label>
+        <div class="field zip required">
+            <label class="label" for="zip">
+                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span>
+            </label>
             <div class="control">
-                <?php echo $block->getCountryHtmlSelect() ?>
+                <input type="text"
+                       name="postcode"
+                       value="<?= $escaper->escapeHtmlAttr($block->getAddress()->getPostcode()) ?>"
+                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>"
+                       id="zip"
+                       class="input-text validate-zip-international
+                        <?= $escaper->escapeHtmlAttr($_postcodeValidationClass) ?>">
+                <div role="alert" class="message warning">
+                    <span></span>
+                </div>
+                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div.message.warning') ?>
             </div>
         </div>
 
-        <?php $userDefinedAttributes = $block->getLayout()->getBlock('customer_form_address_user_attributes'); ?>
-        <?php if ($userDefinedAttributes):?>
-            <?php echo $userDefinedAttributes->setShowContainer(false)->toHtml(); ?>
-        <?php endif;?>
         <?php if ($block->isDefaultBilling()): ?>
             <div class="message info">
-                <span><?php /* @escapeNotVerified */ echo __("This is your default billing address.") ?></span>
+                <span><?= $escaper->escapeHtml(__("It's a default billing address.")) ?></span>
             </div>
         <?php elseif ($block->canSetAsDefaultBilling()): ?>
-        <div class="field choice set billing">
-            <input type="checkbox" id="primary_billing" name="default_billing" value="1" class="checkbox"/>
-            <label class="label" for="primary_billing"><span><?php /* @escapeNotVerified */ echo __('Use as my default billing address') ?></span></label>
-        </div>
+            <div class="field choice set billing">
+                <input type="checkbox" id="primary_billing" name="default_billing" value="1" class="checkbox">
+                <label class="label" for="primary_billing">
+                    <span><?= $escaper->escapeHtml(__('Use as my default billing address')) ?></span>
+                </label>
+            </div>
         <?php else: ?>
-            <input type="hidden" name="default_billing" value="1"/>
+            <input type="hidden" name="default_billing" value="1">
         <?php endif; ?>
 
         <?php if ($block->isDefaultShipping()): ?>
             <div class="message info">
-                <span><?php /* @escapeNotVerified */ echo __("This is your default shipping address.") ?></span>
+                <span><?= $escaper->escapeHtml(__("It's a default shipping address.")) ?></span>
             </div>
         <?php elseif ($block->canSetAsDefaultShipping()): ?>
             <div class="field choice set shipping">
-                <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" class="checkbox"/>
-                <label class="label" for="primary_shipping"><span><?php /* @escapeNotVerified */ echo __('Use as my default shipping address') ?></span></label>
+                <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" class="checkbox">
+                <label class="label" for="primary_shipping">
+                    <span><?= $escaper->escapeHtml(__('Use as my default shipping address')) ?></span>
+                </label>
             </div>
         <?php else: ?>
-            <input type="hidden" name="default_shipping" value="1"/>
+            <input type="hidden" name="default_shipping" value="1">
         <?php endif; ?>
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action submit primary" data-action="save-address" title="<?php /* @escapeNotVerified */ echo __('Save Address') ?>">
-                <span><?php /* @escapeNotVerified */ echo __('Save Address') ?></span>
+            <button type="submit"
+                    class="action save primary"
+                    data-action="save-address"
+                    disabled="disabled"
+                    title="<?= $escaper->escapeHtmlAttr(__('Save Address')) ?>">
+                <span><?= $escaper->escapeHtml(__('Save Address')) ?></span>
             </button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>">
-                <span><?php /* @escapeNotVerified */ echo __('Go back') ?></span>
+            <a class="action back" href="<?= $escaper->escapeUrl($block->getBackUrl()) ?>">
+                <span><?= $escaper->escapeHtml(__('Go back')) ?></span>
             </a>
         </div>
     </div>
@@ -162,18 +237,20 @@
 <script type="text/x-magento-init">
     {
         "#form-validate": {
-            "validation": {}
+            "addressValidation": {
+                "postCodes": <?= /* @noEscape */ $block->getPostCodeConfig()->getSerializedPostCodes() ?>
+            }
         },
         "#country": {
-            "regionUpdater": {
-                "optionalRegionAllowed": <?php /* @escapeNotVerified */ echo($block->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
+            "directoryRegionUpdater": {
+                "optionalRegionAllowed": <?= /* @noEscape */ $_displayAll ? 'true' : 'false' ?>,
                 "regionListId": "#region_id",
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
                 "form": "#form-validate",
-                "regionJson": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                "defaultRegion": "<?php /* @escapeNotVerified */ echo $block->getRegionId() ?>",
-                "countriesWithOptionalZip": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
+                "regionJson": <?= /* @noEscape */ $regionProvider->getRegionJson(); ?>,
+                "defaultRegion": "<?= (int) $block->getRegionId() ?>",
+                "countriesWithOptionalZip": <?= /* @noEscape */ $viewModel->dataGetCountriesWithOptionalZip(true) ?>
             }
         }
     }
diff --git a/view/frontend/templates/experius/customer/form/register.phtml b/view/frontend/templates/experius/customer/form/register.phtml
index 87971be..e32661a 100644
--- a/view/frontend/templates/experius/customer/form/register.phtml
+++ b/view/frontend/templates/experius/customer/form/register.phtml
@@ -1,101 +1,151 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Happy Horizon Utrecht Development & Technology B.V. All rights reserved.
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+use Magento\Customer\Helper\Address;
 
+/** @var \Magento\Customer\Block\Form\Register $block */
+/** @var \Magento\Framework\Escaper $escaper */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+/** @var Magento\Customer\Helper\Address $addressHelper */
+$addressHelper = $block->getData('addressHelper');
+/** @var \Magento\Directory\Helper\Data $directoryHelper */
+$directoryHelper = $block->getData('directoryHelper');
+/** @var \Magento\Customer\ViewModel\Address\RegionProvider $regionProvider */
+$regionProvider = $block->getRegionProvider();
+$formData = $block->getFormData();
+/** @var \Magento\Customer\ViewModel\CreateAccountButton $createAccountButtonViewModel */
+$createAccountButtonViewModel = $block->getData('create_account_button_view_model');
+/** @var \Experius\AddressLines\Helper\Data $experiusAddressLinesHelper */
+$experiusAddressLinesHelper = $this->helper('Experius\AddressLines\Helper\Data');
 ?>
-<?php
-/**
- * Create account form template
- *
- * @var $block \Magento\Customer\Block\Form\Register
- */
-?>
-<?php echo $block->getChildHtml('form_fields_before')?>
+<?php $displayAll = $block->getConfig('general/region/display_all'); ?>
+<?= $block->getChildHtml('form_fields_before') ?>
 <?php /* Extensions placeholder */ ?>
-<?php echo $block->getChildHtml('customer.form.register.extra')?>
-<form class="form create account form-create-account" action="<?php /* @escapeNotVerified */ echo $block->getPostActionUrl() ?>" method="post" id="form-validate" enctype="multipart/form-data" autocomplete="off">
-    <?php /* @noEscape */ echo $block->getBlockHtml('formkey'); ?>
+<?= $block->getChildHtml('customer.form.register.extra') ?>
+<form class="form create account form-create-account"
+      action="<?= $escaper->escapeUrl($block->getPostActionUrl()) ?>"
+      method="post"
+      id="form-validate"
+      enctype="multipart/form-data"
+      autocomplete="off">
+    <?= /* @noEscape */ $block->getBlockHtml('formkey') ?>
     <fieldset class="fieldset create info">
-        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Personal Information') ?></span></legend><br>
-        <input type="hidden" name="success_url" value="<?php /* @escapeNotVerified */ echo $block->getSuccessUrl() ?>">
-        <input type="hidden" name="error_url" value="<?php /* @escapeNotVerified */ echo $block->getErrorUrl() ?>">
-        <?php echo $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
+        <legend class="legend"><span><?= $escaper->escapeHtml(__('Personal Information')) ?></span></legend><br>
+        <input type="hidden" name="success_url" value="<?= $escaper->escapeUrl($block->getSuccessUrl()) ?>">
+        <input type="hidden" name="error_url" value="<?= $escaper->escapeUrl($block->getErrorUrl()) ?>">
+        <?= $block->getLayout()
+                ->createBlock(\Magento\Customer\Block\Widget\Name::class)
+                ->setObject($formData)
+                ->setForceUseCustomerAttributes(true)
+                ->toHtml() ?>
         <?php if ($block->isNewsletterEnabled()): ?>
             <div class="field choice newsletter">
-                <input type="checkbox" name="is_subscribed" title="<?php /* @escapeNotVerified */ echo __('Sign Up for Newsletter') ?>" value="1" id="is_subscribed"<?php if ($block->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
-                <label for="is_subscribed" class="label"><span><?php /* @escapeNotVerified */ echo __('Sign Up for Newsletter') ?></span></label>
+                <input type="checkbox"
+                       name="is_subscribed"
+                       title="<?= $escaper->escapeHtmlAttr(__('Sign Up for Newsletter')) ?>"
+                       value="1"
+                       id="is_subscribed"
+                       <?php if ($formData->getIsSubscribed()): ?>checked="checked"<?php endif; ?>
+                       class="checkbox">
+                <label for="is_subscribed" class="label">
+                    <span><?= $escaper->escapeHtml(__('Sign Up for Newsletter')) ?></span>
+                </label>
             </div>
             <?php /* Extensions placeholder */ ?>
-            <?php echo $block->getChildHtml('customer.form.register.newsletter')?>
+            <?= $block->getChildHtml('customer.form.register.newsletter') ?>
         <?php endif ?>
 
-        <?php $_dob = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
+        <?php $_dob = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Dob::class) ?>
         <?php if ($_dob->isEnabled()): ?>
-            <?php echo $_dob->setDate($block->getFormData()->getDob())->toHtml() ?>
+            <?= $_dob->setDate($formData->getDob())->toHtml() ?>
         <?php endif ?>
 
-        <?php $_taxvat = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
+        <?php $_taxvat = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Taxvat::class) ?>
         <?php if ($_taxvat->isEnabled()): ?>
-            <?php echo $_taxvat->setTaxvat($block->getFormData()->getTaxvat())->toHtml() ?>
+            <?= $_taxvat->setTaxvat($formData->getTaxvat())->toHtml() ?>
         <?php endif ?>
 
-        <?php $_gender = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
+        <?php $_gender = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Gender::class) ?>
         <?php if ($_gender->isEnabled()): ?>
-            <?php echo $_gender->setGender($block->getFormData()->getGender())->toHtml() ?>
+            <?= $_gender->setGender($formData->getGender())->toHtml() ?>
         <?php endif ?>
+        <?= $block->getChildHtml('fieldset_create_info_additional') ?>
     </fieldset>
-    <?php if ($block->getShowAddressFields()): ?>
+    <?php if ($block->getShowAddressFields() || true): ?>
+        <?php $cityValidationClass = $addressHelper->getAttributeValidationClass('city'); ?>
+        <?php $postcodeValidationClass = $addressHelper->getAttributeValidationClass('postcode'); ?>
+        <?php $regionValidationClass = $addressHelper->getAttributeValidationClass('region'); ?>
         <fieldset class="fieldset address">
-            <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Address Information') ?></span></legend><br>
+            <legend class="legend"><span><?= $escaper->escapeHtml(__('Address Information')) ?></span></legend><br>
             <input type="hidden" name="create_address" value="1" />
-            <?php if ($this->helper('Experius\AddressLines\Helper\Data')->isUsedInForm('company')): ?>
-                <?php $attributeValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company'); ?>
-                <div class="field company<?php echo (strpos($attributeValidationClass, 'required-entry')) ? ' required' : '' ?>">
-                    <label for="company" class="label"><span><?php /* @escapeNotVerified */ echo __('Company') ?></span></label>
-                    <div class="control">
-                        <input type="text" name="company" id="company" value="<?php echo $block->escapeHtml($block->getFormData()->getCompany()) ?>" title="<?php /* @escapeNotVerified */ echo __('Company') ?>" class="input-text <?php /* @escapeNotVerified */ echo $attributeValidationClass ?>">
-                    </div>
-                </div>
-            <?php endif; ?>
-            <?php if ($this->helper('Experius\AddressLines\Helper\Data')->isUsedInForm('telephone')): ?>
-                <?php $attributeValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone'); ?>
-                <div class="field telephone<?php echo (strpos($attributeValidationClass, 'required-entry')) ? ' required' : '' ?>">
-                    <label for="telephone" class="label"><span><?php /* @escapeNotVerified */ echo __('Phone Number') ?></span></label>
-                    <div class="control">
-                        <input type="text" name="telephone" id="telephone" value="<?php echo $block->escapeHtml($block->getFormData()->getTelephone()) ?>" title="<?php /* @escapeNotVerified */ echo __('Phone Number') ?>" class="input-text <?php /* @escapeNotVerified */ echo $attributeValidationClass ?>">
-                    </div>
-                </div>
-            <?php endif; ?>
 
-            <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-            <?php $_i = 1; ?>
-            <?php if ($this->helper('Experius\AddressLines\Helper\Data')->getValidationClassesForLine($_i)): ?>
-                <?php $_streetValidationClass .= $this->helper('Experius\AddressLines\Helper\Data')->getValidationClassesForLine($_i); ?>
-            <?php endif; ?>
+            <?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
+            <?php if ($_company->isEnabled()): ?>
+                <?= $_company->setCompany($formData->getCompany())->toHtml() ?>
+            <?php endif ?>
+
+            <?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
+            <?php if ($_telephone->isEnabled()): ?>
+                <?= $_telephone->setTelephone($formData->getTelephone())->toHtml() ?>
+            <?php endif ?>
+
+            <?php $_fax = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Fax::class) ?>
+            <?php if ($_fax->isEnabled()): ?>
+                <?= $_fax->setFax($formData->getFax())->toHtml() ?>
+            <?php endif ?>
+
+            <?php
+                $_streetValidationClass = $addressHelper->getAttributeValidationClass('street');
+                $_updatedStreetValidationClass = $_streetValidationClass . $experiusAddressLinesHelper->getValidationClassesForLine(1);
+                $maxLength = $experiusAddressLinesHelper->getValidationMaxLength(1);
+                $minLength = $experiusAddressLinesHelper->getValidationMinLength(1);
+            ?>
+
             <div class="field street required">
-                <label for="street" class="label"><span><?php /* @escapeNotVerified */ echo __('Street Address') ?></span></label>
+                <label for="street_1" class="label">
+                    <span><?= $escaper->escapeHtmlAttr($experiusAddressLinesHelper->getLineLabel(1)) ?></span>
+                </label>
                 <div class="control">
-                    <label class="label" for="street_<?php /* @escapeNotVerified */ echo $_i ?>">
-                        <span><?php /* @escapeNotVerified */ echo $this->helper('Experius\AddressLines\Helper\Data')->getLineLabel($_i) ?></span>
-                    </label>
-                    <input type="text" name="street[1]" value="<?php echo $block->escapeHtml($block->getFormData()->getStreet(0)) ?>" title="<?php /* @escapeNotVerified */ echo __('Street Address') ?>" id="street_1" class="input-text <?php /* @escapeNotVerified */ echo $_streetValidationClass ?>">
+                    <input type="text"
+                           name="street[0]"
+                           value="<?= $escaper->escapeHtmlAttr($formData->getStreet(0)) ?>"
+                           title="<?= $escaper->escapeHtmlAttr($experiusAddressLinesHelper->getLineLabel(1)) ?>"
+                           id="street_1"
+                           class="input-text <?= $escaper->escapeHtmlAttr($_updatedStreetValidationClass) ?>"
+                        <?= $maxLength ? 'maxlength="' . $maxLength . '"' : ''; ?>
+                        <?= $minLength ? 'minlength="' . $minLength . '"' : ''; ?>
+                    >
                     <div class="nested">
-                        <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
-                            <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-                            <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
-                            <?php if ($this->helper('Experius\AddressLines\Helper\Data')->getValidationClassesForLine($_i)): ?>
-                                <?php $_streetValidationClass .= $this->helper('Experius\AddressLines\Helper\Data')->getValidationClassesForLine($_i); ?>
-                            <?php endif; ?>
-                            <div class="field">
-                                <label class="label" for="street_<?php /* @escapeNotVerified */ echo $_i ?>">
-                                    <span><?php /* @escapeNotVerified */ echo $this->helper('Experius\AddressLines\Helper\Data')->getLineLabel($_i) ?></span>
+                        <?php
+                            $_streetValidationClass = $_streetValidationClass !== null ?
+                                trim(str_replace('required-entry', '', $_streetValidationClass)) : '';
+                            $streetLines = $addressHelper->getStreetLines();
+                        ?>
+                        <?php for ($_i = 2, $_n = $streetLines; $_i <= $_n; $_i++): ?>
+                            <?php
+                            $_updatedStreetValidationClass = $escaper->escapeHtmlAttr($_streetValidationClass);
+                            $_updatedStreetValidationClass .= $escaper->escapeHtmlAttr($experiusAddressLinesHelper->getValidationClassesForLine($_i));
+                            $maxLength = $experiusAddressLinesHelper->getValidationMaxLength($_i);
+                            $minLength = $experiusAddressLinesHelper->getValidationMinLength($_i);
+                            ?>
+                            <div class="field additional">
+                                <label class="label" for="street_<?= /* @noEscape */ $_i ?>">
+                                    <span><?= $escaper->escapeHtmlAttr($experiusAddressLinesHelper->getLineLabel($_i)) ?></span>
                                 </label>
                                 <div class="control">
-                                    <input type="text" name="street[<?php echo $_i; ?>]" <?php if ($this->helper('Experius\AddressLines\Helper\Data')->getValidationMaxLength($_i)) { echo 'maxlength="' . $this->helper('Experius\AddressLines\Helper\Data')->getValidationMaxLength($_i) . '"' ; } ?> <?php if ($this->helper('Experius\AddressLines\Helper\Data')->getValidationMinLength($_i)) { echo 'minlength="' . $this->helper('Experius\AddressLines\Helper\Data')->getValidationMinLength($_i) . '"' ; } ?> value="<?php echo $block->escapeHtml($block->getFormData()->getStreetLine($_i - 1)) ?>" title="<?php /* @escapeNotVerified */ echo $this->helper('Experius\AddressLines\Helper\Data')->getLineLabel($_i) ?>" id="street_<?php /* @escapeNotVerified */ echo $_i ?>" class="input-text <?php /* @escapeNotVerified */ echo $_streetValidationClass ?>">
+                                    <input type="text"
+                                           name="street[<?= /* @noEscape */ $_i ?>]"
+                                           value="<?= $escaper->escapeHtml($formData->getStreetLine($_i - 1)) ?>"
+                                           title="<?= $escaper->escapeHtmlAttr($experiusAddressLinesHelper->getLineLabel($_i)) ?>"
+                                           id="street_<?= /* @noEscape */ $_i ?>"
+                                           class="input-text <?= $_updatedStreetValidationClass ?>"
+                                        <?= $maxLength ? 'maxlength="' . $maxLength . '"' : ''; ?>
+                                        <?= $minLength ? 'minlength="' . $minLength . '"' : ''; ?>
+                                    >
                                 </div>
                             </div>
                         <?php endfor; ?>
@@ -103,71 +153,131 @@
                 </div>
             </div>
 
-            <div class="field required">
-                <label for="city" class="label"><span><?php /* @escapeNotVerified */ echo __('City') ?></span></label>
+            <?php if ($addressHelper->isVatAttributeVisible()): ?>
+                <?php $_vatidValidationClass = $addressHelper->getAttributeValidationClass('vat_id'); ?>
+                <div class="field taxvat">
+                    <label class="label" for="vat_id">
+                        <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?></span>
+                    </label>
+                    <div class="control">
+                        <input type="text"
+                               name="vat_id"
+                               value="<?= $escaper->escapeHtmlAttr($formData->getVatId()) ?>"
+                               title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?>"
+                               class="input-text <?= $escaper->escapeHtmlAttr($_vatidValidationClass) ?>"
+                               id="vat_id">
+                    </div>
+                </div>
+            <?php endif; ?>
+
+            <div class="field country required">
+                <label for="country" class="label">
+                    <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('country_id') ?></span>
+                </label>
                 <div class="control">
-                    <input type="text" name="city" value="<?php echo $block->escapeHtml($block->getFormData()->getCity()) ?>" title="<?php /* @escapeNotVerified */ echo __('City') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city">
+                    <?= $block->getCountryHtmlSelect() ?>
                 </div>
             </div>
 
             <div class="field region required">
-                <label for="region_id" class="label"><span><?php /* @escapeNotVerified */ echo __('State/Province') ?></span></label>
+                <label for="region_id" class="label">
+                    <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span>
+                </label>
                 <div class="control">
-                    <select id="region_id" name="region_id" title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="validate-select" style="display:none;">
-                        <option value=""><?php /* @escapeNotVerified */ echo __('Please select a region, state or province.') ?></option>
+                    <select id="region_id"
+                            name="region_id"
+                            title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
+                            class="validate-select region_id">
+                        <option value="">
+                            <?= $escaper->escapeHtml(__('Please select a region, state or province.')) ?>
+                        </option>
                     </select>
-                    <input type="text" id="region" name="region" value="<?php echo $block->escapeHtml($block->getRegion()) ?>" title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;">
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'select#region_id') ?>
+                    <input type="text"
+                           id="region"
+                           name="region"
+                           value="<?= $escaper->escapeHtml($block->getRegion()) ?>"
+                           title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
+                           class="input-text <?= $escaper->escapeHtmlAttr($regionValidationClass) ?>">
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'input#region') ?>
                 </div>
             </div>
 
-            <div class="field zip required">
-                <label for="zip" class="label"><span><?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?></span></label>
+            <div class="field required">
+                <label for="city" class="label">
+                    <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span>
+                </label>
                 <div class="control">
-                    <input type="text" name="postcode" value="<?php echo $block->escapeHtml($block->getFormData()->getPostcode()) ?>" title="<?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>">
+                    <input type="text"
+                           name="city"
+                           value="<?= $escaper->escapeHtmlAttr($formData->getCity()) ?>"
+                           title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?>"
+                           class="input-text <?= $escaper->escapeHtmlAttr($cityValidationClass) ?>"
+                           id="city">
                 </div>
             </div>
 
-            <div class="field country required">
-                <label for="country" class="label"><span><?php /* @escapeNotVerified */ echo __('Country') ?></span></label>
+            <div class="field zip required">
+                <label for="zip" class="label">
+                    <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span>
+                </label>
                 <div class="control">
-                    <?php echo $block->getCountryHtmlSelect() ?>
+                    <input type="text"
+                           name="postcode"
+                           value="<?= $escaper->escapeHtmlAttr($formData->getPostcode()) ?>"
+                           title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>"
+                           id="zip"
+                           class="input-text validate-zip-international
+                            <?= $escaper->escapeHtmlAttr($postcodeValidationClass) ?>">
                 </div>
             </div>
+
             <?php $addressAttributes = $block->getChildBlock('customer_form_address_user_attributes');?>
             <?php if ($addressAttributes): ?>
                 <?php $addressAttributes->setEntityType('customer_address'); ?>
                 <?php $addressAttributes->setFieldIdFormat('address:%1$s')->setFieldNameFormat('address[%1$s]');?>
                 <?php $block->restoreSessionData($addressAttributes->getMetadataForm(), 'address');?>
-                <?php echo $addressAttributes->setShowContainer(false)->toHtml()?>
+                <?= $addressAttributes->setShowContainer(false)->toHtml() ?>
             <?php endif;?>
             <input type="hidden" name="default_billing" value="1">
             <input type="hidden" name="default_shipping" value="1">
         </fieldset>
 
     <?php endif; ?>
-    <fieldset class="fieldset create account" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
-        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Sign-in Information') ?></span></legend><br>
+    <fieldset class="fieldset create account"
+              data-hasrequired="<?= $escaper->escapeHtmlAttr(__('* Required Fields')) ?>">
+        <legend class="legend"><span><?= $escaper->escapeHtml(__('Sign-in Information')) ?></span></legend><br>
         <div class="field required">
-            <label for="email_address" class="label"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
+            <label for="email_address" class="label"><span><?= $escaper->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" autocomplete="email" id="email_address" value="<?php echo $block->escapeHtml($block->getFormData()->getEmail()) ?>" title="<?php /* @escapeNotVerified */ echo __('Email') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}">
+                <input type="email"
+                       name="email"
+                       autocomplete="email"
+                       id="email_address"
+                       value="<?= $escaper->escapeHtmlAttr($formData->getEmail()) ?>"
+                       title="<?= $escaper->escapeHtmlAttr(__('Email')) ?>"
+                       class="input-text"
+                       data-mage-init='{"mage/trim-input":{}}'
+                       data-validate="{required:true, 'validate-email':true}">
             </div>
         </div>
-        <div class="field password required" data-mage-init='{"passwordStrengthIndicator": {}}'>
-            <label for="password" class="label"><span><?php /* @escapeNotVerified */ echo __('Password') ?></span></label>
+        <div class="field password required">
+            <label for="password" class="label"><span><?= $escaper->escapeHtml(__('Password')) ?></span></label>
             <div class="control">
                 <input type="password" name="password" id="password"
-                       title="<?php /* @escapeNotVerified */ echo __('Password') ?>"
+                       title="<?= $escaper->escapeHtmlAttr(__('Password')) ?>"
                        class="input-text"
-                       data-password-min-length="<?php echo $block->escapeHtml($block->getMinimumPasswordLength()) ?>"
-                       data-password-min-character-sets="<?php echo $block->escapeHtml($block->getRequiredCharacterClassesNumber()) ?>"
+                       data-password-min-length="<?=
+                        $escaper->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>"
+                       data-password-min-character-sets="<?=
+                        $escaper->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>"
                        data-validate="{required:true, 'validate-customer-password':true}"
                        autocomplete="off">
-                <div id="password-strength-meter-container" data-role="password-strength-meter" >
+                <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
                     <div id="password-strength-meter" class="password-strength-meter">
-                        <?php /* @escapeNotVerified */ echo __('Password Strength'); ?>:
-                        <span id="password-strength-meter-label" data-role="password-strength-meter-label" >
-                            <?php /* @escapeNotVerified */ echo __('No Password'); ?>
+                        <?= $escaper->escapeHtml(__('Password Strength')) ?>:
+                        <span id="password-strength-meter-label" data-role="password-strength-meter-label">
+                            <?= $escaper->escapeHtml(__('No Password')) ?>
                         </span>
                     </div>
                 </div>
@@ -175,33 +285,60 @@
 
         </div>
         <div class="field confirmation required">
-            <label for="password-confirmation" class="label"><span><?php /* @escapeNotVerified */ echo __('Confirm Password') ?></span></label>
+            <label for="password-confirmation" class="label">
+                <span><?= $escaper->escapeHtml(__('Confirm Password')) ?></span>
+            </label>
             <div class="control">
-                <input type="password" name="password_confirmation" title="<?php /* @escapeNotVerified */ echo __('Confirm Password') ?>" id="password-confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}" autocomplete="off">
+                <input type="password"
+                       name="password_confirmation"
+                       title="<?= $escaper->escapeHtmlAttr(__('Confirm Password')) ?>"
+                       id="password-confirmation"
+                       class="input-text"
+                       data-validate="{required:true, equalTo:'#password'}"
+                       autocomplete="off">
             </div>
         </div>
-        <?php echo $block->getChildHtml('form_additional_info'); ?>
+        <div class="field choice" data-bind="scope: 'showPassword'">
+            <!-- ko template: getTemplate() --><!-- /ko -->
+        </div>
+    </fieldset>
+
+    <fieldset class="fieldset additional_info">
+        <?= $block->getChildHtml('form_additional_info') ?>
     </fieldset>
+
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action submit primary" title="<?php /* @escapeNotVerified */ echo __('Create an Account') ?>"><span><?php /* @escapeNotVerified */ echo __('Create an Account') ?></span></button>
+            <button type="submit"
+                    class="action submit primary"
+                    title="<?= $escaper->escapeHtmlAttr(__('Create an Account')) ?>"
+                    id="send2"
+                    <?php if ($createAccountButtonViewModel->disabled()): ?> disabled="disabled" <?php endif; ?>>
+                <span><?= $escaper->escapeHtml(__('Create an Account')) ?></span>
+            </button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php /* @escapeNotVerified */ echo __('Back') ?></span></a>
+            <a class="action back"
+               href="<?= $escaper->escapeUrl($block->getBackUrl()) ?>">
+                <span><?= $escaper->escapeHtml(__('Back')) ?></span>
+            </a>
         </div>
     </div>
 </form>
-<script>
+<?php $ignore = /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null';
+$scriptString = <<<script
 require([
     'jquery',
     'mage/mage'
 ], function($){
 
     var dataForm = $('#form-validate');
-    var ignore = <?php /* @escapeNotVerified */ echo $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null'; ?>;
+    var ignore = {$ignore};
 
     dataForm.mage('validation', {
-    <?php if ($_dob->isEnabled()): ?>
+script;
+if ($_dob->isEnabled()):
+    $scriptString .= <<<script
         errorPlacement: function(error, element) {
             if (element.prop('id').search('full') !== -1) {
                 var dobElement = $(element).parents('.customer-dob'),
@@ -215,28 +352,62 @@ require([
             }
         },
         ignore: ':hidden:not(' + ignore + ')'
-    <?php else: ?>
+script;
+else:
+    $scriptString .= <<<script
         ignore: ignore ? ':hidden:not(' + ignore + ')' : ':hidden'
-    <?php endif ?>
+script;
+endif;
+$scriptString .= <<<script
     }).find('input:text').attr('autocomplete', 'off');
-
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php if ($block->getShowAddressFields()): ?>
+    <?php
+    $regionJson = /* @noEscape */ $regionProvider->getRegionJson();
+    $regionId = (int) $formData->getRegionId();
+    $countriesWithOptionalZip = /* @noEscape */ $directoryHelper->getCountriesWithOptionalZip(true);
+    ?>
+<?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate ?>
 <script type="text/x-magento-init">
     {
         "#country": {
-            "regionUpdater": {
-                "optionalRegionAllowed": <?php /* @escapeNotVerified */ echo($block->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
+            "directoryRegionUpdater": {
+                "optionalRegionAllowed": <?= /* @noEscape */ $displayAll ? 'true' : 'false' ?>,
                 "regionListId": "#region_id",
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
                 "form": "#form-validate",
-                "regionJson": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                "defaultRegion": "<?php /* @escapeNotVerified */ echo $block->getFormData()->getRegionId() ?>",
-                "countriesWithOptionalZip": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
+                "regionJson": <?= /* @noEscape */ $regionJson ?>,
+                "defaultRegion": <?= /* @noEscape */ $regionId ?>,
+                "countriesWithOptionalZip": <?=  /* @noEscape */ $countriesWithOptionalZip ?>
             }
         }
     }
 </script>
 <?php endif; ?>
+<?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate ?>
+<script type="text/x-magento-init">
+    {
+        ".field.password": {
+            "passwordStrengthIndicator": {
+                "formSelector": "form.form-create-account"
+            }
+        },
+        "*": {
+            "Magento_Customer/js/block-submit-on-send": {
+                "formId": "form-validate"
+            },
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "showPassword": {
+                        "component": "Magento_Customer/js/show-password",
+                        "passwordSelector": "#password,#password-confirmation"
+                    }
+                }
+            }
+        }
+    }
+</script>
diff --git a/view/frontend/web/template/group/group.html b/view/frontend/web/template/group/group.html
index bfd3fc5..316c935 100644
--- a/view/frontend/web/template/group/group.html
+++ b/view/frontend/web/template/group/group.html
@@ -1,6 +1,6 @@
 <!--
 /**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * Copyright © Happy Horizon Utrecht Development & Technology B.V. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->