diff --git a/.liquibase/Data_alias/basic/2021.2.0/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
index 6cf5d524b1420157e979a3d41c742b3f3e586a6d..e45780f3a8c5af0b7c44f1ac39841430fe1a3feb 100644
--- a/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
@@ -13,4 +13,4 @@
     <include relativeToChangelogFile="true" file="EwsContactSync/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Export/changelog.xml"/>
     <include relativeToChangelogFile="true" file="insert_ProductGroupcode.xml"/>
-</databaseChangeLog>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/BulkMail/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1f04bc2b9923e4c127ec5e87d952657c13dd6933
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="insertBulkMailSenderAddressKeyword.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.xml b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0fc18b63a15ed14e6486279434c15da61ad7cc5f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.xml
@@ -0,0 +1,24 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="m.groppe" id="50badea9-da46-4aa0-94ed-a2c3db2874ac">
+        <insert tableName="AB_KEYWORD_CATEGORY">
+            <column name="AB_KEYWORD_CATEGORYID" value="3f31d08d-bf59-4bb7-9e96-7f026571cb79"/>
+            <column name="NAME" value="BulkmailSenderAddress"/>
+            <column name="SORTINGBY" valueNumeric="0"/>
+            <column name="SORTINGDIRECTION" value="ASC"/>
+        </insert>
+
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="c4773a13-314d-4f00-a7d3-ab65947586ba"/>
+            <column name="KEYID" value="news@adito.de"/>
+            <column name="TITLE" value="news@adito.de"/>
+            <column name="CONTAINER"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="3f31d08d-bf59-4bb7-9e96-7f026571cb79"/>
+        </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
index 3531213312bf23271c6677894a9531fe4641d136..21037e1fc0c293ee4a83d614310ecc673a318ee1 100644
--- a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
@@ -10,4 +10,5 @@
     <include relativeToChangelogFile="true" file="Mosaico/insert_mosaico_color_keyword.xml"/>
     <include relativeToChangelogFile="true" file="mailbridge/changelog.xml"/>
     <include relativeToChangelogFile="true" file="OfferOrder/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="BulkMail/changelog.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index 5a95e209f60d6d026a2f8406f132dc440eaa1b37..c91cdcca4a5efb196f0c9d442aead91a284f0c4e 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -93,8 +93,9 @@
     <entityField>
       <name>SENDER</name>
       <title>Sender address</title>
+      <consumer>SenderAddressKeyword</consumer>
       <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sender/valueProcess.js</valueProcess>
+      <textInputAllowed v="true" />
       <onValidation>%aditoprj%/entity/BulkMail_entity/entityfields/sender/onValidation.js</onValidation>
     </entityField>
     <entityField>
@@ -641,6 +642,20 @@
         <fieldName>ISO3Name</fieldName>
       </dependency>
     </entityConsumer>
+    <entityConsumer>
+      <name>SenderAddressKeyword</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/BulkMail_entity/entityfields/sender/valueProcess.js b/entity/BulkMail_entity/entityfields/sender/valueProcess.js
deleted file mode 100644
index 88626d517388be0ae8c0186c2f3729d00b741eb7..0000000000000000000000000000000000000000
--- a/entity/BulkMail_entity/entityfields/sender/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("Communication_lib");
-import("system.result");
-import("Employee_lib");
-
-if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-result.string(CommUtil.getStandardMail(EmployeeUtils.getCurrentContactId()));
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js b/entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6429e2a55e085b274b35eeabbe613c94741d8b5e
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.bulkMailSenderAddress());
\ No newline at end of file
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 678044ed0455ad46831c71e6c63ba16bcfefbdca..96b33aae0bfb08e563dab33e33eac11420ccd979 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -521,6 +521,8 @@ $KeywordRegistry.linkEvaluationType$default = function(){return "LINKEVALUATION_
 $KeywordRegistry.linkEvaluationType$ignore = function(){return "LINKEVALUATION_IGNORE";};
 $KeywordRegistry.linkEvaluationType$unsubscribe = function(){return "LINKEVALUATION_UNSUBSCRIBE";};
 
+$KeywordRegistry.bulkMailSenderAddress = function() {return "BulkmailSenderAddress";};
+
 $KeywordRegistry.mosaicoBaseTemplate = function(){return "MosaicoBaseTemplate";};
 $KeywordRegistry.mosaicoColor = function(){return "MosaicoColor";};
 $KeywordRegistry.mosaicoTemplateCategory = function(){return "MosaicoTemplateCategory";};
\ No newline at end of file