diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Forms/AdresscheckForm.form.yaml b/web/typo3conf/ext/ep_theme/Resources/Private/Forms/AdresscheckForm.form.yaml
index 4ee064cf..2235ed05 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Forms/AdresscheckForm.form.yaml
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Forms/AdresscheckForm.form.yaml
@@ -2,25 +2,29 @@
 renderingOptions:
   submitButtonLabel: Absenden
 type: Form
-identifier: adresscheck
-label: Adresscheck
+identifier: adresscheck-ext
+label: Adresscheck (EXT)
 prototypeName: standard
 finishers:
-#-
-#  options:
-#    subject: Adresscheck
-#    recipientAddress: ' pascal.heim@ep-reisen.de'
-#    recipientName: 'Pascal Heim'
-#    senderAddress: smtprelay@ep-reisen.de
-#    senderName: 'E&P Reisen'
-#    replyToAddress: ''
-#    carbonCopyAddress: ''
-#    blindCarbonCopyAddress: ''
-#    format: html
-#    attachUploads: false
-#    translation:
-#      language: ''
-#  identifier: EmailToReceiver
+-
+  options:
+    subject: Adresscheck
+    recipientAddress: ' pascal.heim@ep-reisen.de'
+    recipientName: 'Pascal Heim'
+    senderAddress: smtprelay@ep-reisen.de
+    senderName: 'E&P Reisen'
+    replyToAddress: ''
+    carbonCopyAddress: ''
+    blindCarbonCopyAddress: ''
+    format: html
+    attachUploads: false
+    translation:
+      language: ''
+  identifier: EmailToReceiver
+- options:
+    pageUid: '1606'
+    additionalParameters: ''
+  identifier: Redirect
 -
   identifier: SaveToDatabase
   options:
@@ -29,32 +33,34 @@ finishers:
     mode: insert
     databaseColumnMappings:
       pid:
-        value: 1
-      elements:
-        customer-id:
-          mapOnDatabaseColumn: 'customer_id'
-        title:
-          mapOnDatabaseColumn: 'title'
-        first-name:
-          mapOnDatabaseColumn: 'first_name'
-        last-name:
-          mapOnDatabaseColumn: 'last_name'
-        address:
-          mapOnDatabaseColumn: 'address'
-        zip:
-          mapOnDatabaseColumn: 'zip'
-        city:
-          mapOnDatabaseColumn: 'city'
-        country:
-          mapOnDatabaseColumn: 'country'
-        email:
-          mapOnDatabaseColumn: 'email'
-        no-postal:
-          mapOnDatabaseColumn: 'no_postal'
-        no-email:
-          mapOnDatabaseColumn: 'no_email'
-        address-is-current-postal:
-          mapOnDatabaseColumn: 'address_current'
+        value: 1228
+    elements:
+      pid:
+        mapOnDatabaseColumn: 'pid'
+      customer-id:
+        mapOnDatabaseColumn: 'customer_id'
+      title:
+        mapOnDatabaseColumn: 'title'
+      first-name:
+        mapOnDatabaseColumn: 'first_name'
+      last-name:
+        mapOnDatabaseColumn: 'last_name'
+      address:
+        mapOnDatabaseColumn: 'address'
+      zip:
+        mapOnDatabaseColumn: 'zip'
+      city:
+        mapOnDatabaseColumn: 'city'
+      country:
+        mapOnDatabaseColumn: 'country'
+      email:
+        mapOnDatabaseColumn: 'email'
+      no-postal:
+        mapOnDatabaseColumn: 'no_postal'
+      no-email:
+        mapOnDatabaseColumn: 'no_email'
+      address-is-current-postal:
+        mapOnDatabaseColumn: 'address_current'
 renderables:
 -
   renderingOptions:
diff --git a/web/typo3conf/ext/ep_theme/ext_tables.sql b/web/typo3conf/ext/ep_theme/ext_tables.sql
index d5442825..75ed7f3b 100644
--- a/web/typo3conf/ext/ep_theme/ext_tables.sql
+++ b/web/typo3conf/ext/ep_theme/ext_tables.sql
@@ -141,6 +141,7 @@ CREATE TABLE tx_eptheme_domain_model_addresscheck (
 	name tinytext,
 	first_name tinytext,
 	last_name tinytext,
+	customer_id varchar(255) DEFAULT '' NOT NULL,
 	title varchar(255) DEFAULT '' NOT NULL,
 	email varchar(255) DEFAULT '' NOT NULL,
 	address tinytext,