diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
index 88d3c5a8853f2eb7ae72c97dce81c40df5b93c4d..f196fedfb7d3b403106f4a4665ee0767b72544de 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
@@ -1,112 +1,121 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="j.hoermanns" id="f51b5b01-c172-49b7-97b8-13b54d3aafdb">
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="6f2070f6-26ce-4361-8ad5-df7e8bb09410"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="1edd7253-c1a9-4eb1-92b8-ce2ad9262aa9"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="22864525-f580-4ce3-b5d5-2034519cb482"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="0a9afbd0-54c8-4141-834c-a1fad149aeed"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Birgit Leicht"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="afc7201d-a72d-49d5-842d-04d6192f6302"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Birgit"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="b1832c76-356c-4909-a6ef-bde0c0e1c857"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Leicht"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="b091cb95-5976-4b8f-975f-c411b82b5b8c"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="48e35d4e-93c9-49e9-bc7e-b1f105bed72d"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="8888f771-9e61-4ea8-8e3b-388bcfbdd4bf"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="e961b7da-561c-436a-a718-8746fa818d30"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="b.leicht@domain.local"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="fb684399-de76-44dd-975d-f3d4d6c95c42"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="b.leicht@domain.local"/>
-    </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115" />
-            </whereParams>
-        </delete>
-    </rollback>
-</changeSet>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermanns" id="f51b5b01-c172-49b7-97b8-13b54d3aafdb">
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="6f2070f6-26ce-4361-8ad5-df7e8bb09410"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="lastModified"/>
+        <column name="PROPVAL" value="1544193908535"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="1edd7253-c1a9-4eb1-92b8-ce2ad9262aa9"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="contactID"/>
+        <column name="PROPVAL" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="22864525-f580-4ce3-b5d5-2034519cb482"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="name"/>
+        <column name="PROPVAL" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="0a9afbd0-54c8-4141-834c-a1fad149aeed"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="title"/>
+        <column name="PROPVAL" value="Birgit Leicht"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="afc7201d-a72d-49d5-842d-04d6192f6302"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="firstname"/>
+        <column name="PROPVAL" value="Birgit"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="b1832c76-356c-4909-a6ef-bde0c0e1c857"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="lastname"/>
+        <column name="PROPVAL" value="Leicht"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="ROLE"/>
+        <column name="ID" value="b091cb95-5976-4b8f-975f-c411b82b5b8c"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="roleNames"/>
+        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="48e35d4e-93c9-49e9-bc7e-b1f105bed72d"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="password"/>
+        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="8888f771-9e61-4ea8-8e3b-388bcfbdd4bf"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="passwordChanged"/>
+        <column name="PROPVAL" value="1533122217399"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="e961b7da-561c-436a-a718-8746fa818d30"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="email"/>
+        <column name="PROPVAL" value="b.leicht@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="fb684399-de76-44dd-975d-f3d4d6c95c42"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="calendarID"/>
+        <column name="PROPVAL" value="b.leicht@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="7025fd5a-3b29-4412-87d9-a02b7e543649"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="isActive"/>
+        <column name="PROPVAL" value="true"/>
+    </insert>
+    <rollback>
+        <delete tableName="ASYS_USERS">
+            <where>NAME = ?</where>
+            <whereParams>
+                    <param value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115" />
+            </whereParams>
+        </delete>
+    </rollback>
+</changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
index 647680ecf2f91147da4abdc4302d66de55c7734d..93e94c583b5664bf56730da9e573201237bd4f52 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
@@ -1,112 +1,121 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
-    <changeSet author="j.hoermanns" id="3b2eb88a-7d8f-4b51-a361-29170982d152">
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="63b9438d-1a63-49c9-85c2-6bc28efe87e5"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="0eabe917-fcf7-46e4-92d1-f7d326ded6c4"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="a9efc147-d086-477f-b3d5-6eea09c95e2e"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="5064165c-a566-4905-a9ba-6df21c150935"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Harold Smith"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="efb6610d-8990-40c7-8044-9d3f471fe08c"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Harold"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="95761793-e2e5-439f-9313-e75e4558c8f0"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Smith"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="9e7f3f53-3df4-4e6e-b16c-f13f2430c871"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="89cda16b-f94f-4b20-8fea-184250de76f2"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="70fcb1a9-b13b-4222-afdc-c39de33ffe36"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="28b90a4a-b098-42cc-bd5c-27cb27988307"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="h.smith@domain.local"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="ce8946ae-eb69-46fe-b63b-d4684c0189bb"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="h.smith@domain.local"/>
-    </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_0555b87b-5708-4748-aa88-064e33cab002" />
-            </whereParams>
-        </delete>
-    </rollback>
-</changeSet>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
+    <changeSet author="j.hoermanns" id="3b2eb88a-7d8f-4b51-a361-29170982d152">
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="63b9438d-1a63-49c9-85c2-6bc28efe87e5"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="lastModified"/>
+        <column name="PROPVAL" value="1544193908535"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="0eabe917-fcf7-46e4-92d1-f7d326ded6c4"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="contactID"/>
+        <column name="PROPVAL" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="a9efc147-d086-477f-b3d5-6eea09c95e2e"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="name"/>
+        <column name="PROPVAL" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="5064165c-a566-4905-a9ba-6df21c150935"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="title"/>
+        <column name="PROPVAL" value="Harold Smith"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="efb6610d-8990-40c7-8044-9d3f471fe08c"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="firstname"/>
+        <column name="PROPVAL" value="Harold"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="95761793-e2e5-439f-9313-e75e4558c8f0"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="lastname"/>
+        <column name="PROPVAL" value="Smith"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="ROLE"/>
+        <column name="ID" value="9e7f3f53-3df4-4e6e-b16c-f13f2430c871"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="roleNames"/>
+        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="89cda16b-f94f-4b20-8fea-184250de76f2"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="password"/>
+        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="70fcb1a9-b13b-4222-afdc-c39de33ffe36"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="passwordChanged"/>
+        <column name="PROPVAL" value="1533122217399"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="28b90a4a-b098-42cc-bd5c-27cb27988307"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="email"/>
+        <column name="PROPVAL" value="h.smith@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="ce8946ae-eb69-46fe-b63b-d4684c0189bb"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="calendarID"/>
+        <column name="PROPVAL" value="h.smith@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="0b5d827a-32dc-4cd5-b023-2f4fbc65f43e"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="isActive"/>
+        <column name="PROPVAL" value="true"/>
+    </insert>
+    <rollback>
+        <delete tableName="ASYS_USERS">
+            <where>NAME = ?</where>
+            <whereParams>
+                    <param value="_____USER_0555b87b-5708-4748-aa88-064e33cab002" />
+            </whereParams>
+        </delete>
+    </rollback>
+</changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
index d6bfa4cc7aae62e64d57e5a460edbfc20f4a98a1..ee371fc7639d5acd9d334a2d0b0641e51215ef6e 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
@@ -1,112 +1,121 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
-    <changeSet author="j.hoermanns" id="f9502718-5fca-4a3c-a439-22b28a6a4866">
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="a501ba6e-4229-4bcc-9587-3e5b3516f1b5"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="e7a50a5e-7208-4821-b223-720721067edb"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="3cd16b02-ea88-4a95-b837-95cd4e989094"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="c1114ba2-3a61-460f-868b-af15e1113a87"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Herbert Obermeier"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="182783dc-9ca6-469c-8f5b-1c732a0c4830"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Herbert"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="3a555e19-4f2e-4327-98cc-515658c7c17f"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Obermeier"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="fbd983eb-e30b-4dee-b2c5-d682727a614b"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="98a96f11-de67-4efb-8977-5dc459f3f396"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="68a5bb62-d0f7-4268-881f-d86466ad67c3"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="230a9a3b-92d9-474b-a10f-8e5ac63d9a12"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="h.obermeier@domain.local"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="b1ef9091-a7e1-4800-9e7e-ed72aa419124"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="h.obermeier@domain.local"/>
-    </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65" />
-            </whereParams>
-        </delete>
-    </rollback>
-</changeSet>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
+    <changeSet author="j.hoermanns" id="f9502718-5fca-4a3c-a439-22b28a6a4866">
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="a501ba6e-4229-4bcc-9587-3e5b3516f1b5"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="lastModified"/>
+        <column name="PROPVAL" value="1544193908535"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="e7a50a5e-7208-4821-b223-720721067edb"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="contactID"/>
+        <column name="PROPVAL" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="3cd16b02-ea88-4a95-b837-95cd4e989094"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="name"/>
+        <column name="PROPVAL" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="c1114ba2-3a61-460f-868b-af15e1113a87"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="title"/>
+        <column name="PROPVAL" value="Herbert Obermeier"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="182783dc-9ca6-469c-8f5b-1c732a0c4830"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="firstname"/>
+        <column name="PROPVAL" value="Herbert"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="3a555e19-4f2e-4327-98cc-515658c7c17f"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="lastname"/>
+        <column name="PROPVAL" value="Obermeier"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="ROLE"/>
+        <column name="ID" value="fbd983eb-e30b-4dee-b2c5-d682727a614b"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="roleNames"/>
+        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="98a96f11-de67-4efb-8977-5dc459f3f396"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="password"/>
+        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="68a5bb62-d0f7-4268-881f-d86466ad67c3"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="passwordChanged"/>
+        <column name="PROPVAL" value="1533122217399"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="230a9a3b-92d9-474b-a10f-8e5ac63d9a12"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="email"/>
+        <column name="PROPVAL" value="h.obermeier@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="b1ef9091-a7e1-4800-9e7e-ed72aa419124"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="calendarID"/>
+        <column name="PROPVAL" value="h.obermeier@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="70f4ff0b-06de-4346-9350-469d401fad5e"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="isActive"/>
+        <column name="PROPVAL" value="true"/>
+    </insert>
+    <rollback>
+        <delete tableName="ASYS_USERS">
+            <where>NAME = ?</where>
+            <whereParams>
+                    <param value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65" />
+            </whereParams>
+        </delete>
+    </rollback>
+</changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
index 127523a4a751669d6f30bf1ef8894a89d96f68d9..8e7e94d052ab9f5e7e46ff656f32036e7575159d 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
@@ -1,112 +1,121 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
-    <changeSet author="j.hoermanns" id="d0cbed0a-5977-456f-b410-7f4a80c17cfd">
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="f139e953-b295-4bbd-927e-b894ff4d3b67"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="0a73d381-b0a1-4156-b9c2-3c6e1d909ff0"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="3264f099-27f8-4d8d-a471-01536ef8bdbd"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="54e6a89d-5283-4966-8780-b93cbca97b29"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Lisa Sommer"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="f3403820-b7ee-4e90-8c4b-881d8ccc223b"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Lisa"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="3cedc3be-ad6d-489a-a8c9-84bf96363229"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Sommer"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="9dc8712b-384b-4e62-9fab-22982c1a8acc"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="a4de6db6-fc43-4bc4-b3fd-75bb7602a08c"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="8479dc65-f3eb-43fe-9161-92e2e5bd7a52"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="535e6910-1e5c-45dd-89cc-8695266d2563"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="demo@domain.local"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="518fa115-27f6-42af-883d-f234229df8f5"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="demo@domain.local"/>
-    </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9" />
-            </whereParams>
-        </delete>
-    </rollback>
-</changeSet>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
+    <changeSet author="j.hoermanns" id="d0cbed0a-5977-456f-b410-7f4a80c17cfd">
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="f139e953-b295-4bbd-927e-b894ff4d3b67"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="lastModified"/>
+        <column name="PROPVAL" value="1544193908535"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="0a73d381-b0a1-4156-b9c2-3c6e1d909ff0"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="contactID"/>
+        <column name="PROPVAL" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="3264f099-27f8-4d8d-a471-01536ef8bdbd"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="name"/>
+        <column name="PROPVAL" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="54e6a89d-5283-4966-8780-b93cbca97b29"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="title"/>
+        <column name="PROPVAL" value="Lisa Sommer"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="f3403820-b7ee-4e90-8c4b-881d8ccc223b"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="firstname"/>
+        <column name="PROPVAL" value="Lisa"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="3cedc3be-ad6d-489a-a8c9-84bf96363229"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="lastname"/>
+        <column name="PROPVAL" value="Sommer"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="ROLE"/>
+        <column name="ID" value="9dc8712b-384b-4e62-9fab-22982c1a8acc"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="roleNames"/>
+        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="a4de6db6-fc43-4bc4-b3fd-75bb7602a08c"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="password"/>
+        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="8479dc65-f3eb-43fe-9161-92e2e5bd7a52"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="passwordChanged"/>
+        <column name="PROPVAL" value="1533122217399"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="535e6910-1e5c-45dd-89cc-8695266d2563"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="email"/>
+        <column name="PROPVAL" value="demo@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="518fa115-27f6-42af-883d-f234229df8f5"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="calendarID"/>
+        <column name="PROPVAL" value="demo@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="9d66fea5-771e-44e2-8663-792ef9f13f8e"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="isActive"/>
+        <column name="PROPVAL" value="true"/>
+    </insert>
+    <rollback>
+        <delete tableName="ASYS_USERS">
+            <where>NAME = ?</where>
+            <whereParams>
+                    <param value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9" />
+            </whereParams>
+        </delete>
+    </rollback>
+</changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
index d69b80a262fde90f2f6ac552996c9fbd5d8d3ea8..fbe592df0aee0e00b14bfb9b62577029b72869a8 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
@@ -1,112 +1,121 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
-    <changeSet author="j.hoermanns" id="88a254de-509f-4eba-a88d-8539ca8cd37f">
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="b5dd10e8-188d-477d-ae61-a3c36da643a8"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="7f566326-c405-4238-8974-d92aafab0b80"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="1525c79d-2f48-4fa4-b2e7-1a5a6cb502e8"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="8ee8c986-72da-49d6-87eb-403b0994203a"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Susanne Lustig"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="2360c964-f456-423c-83f7-79ec57aff10f"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Susanne"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="504e660a-8c64-41e3-99c3-e39b5f2ee0ce"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Lustig"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="e753cd61-fcb6-4b89-8f29-93b875ccc388"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="e4d362f3-8bc3-4dd5-9b1c-d338017b5aaa"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="a796eef7-72b6-435a-adbc-4e9356fcd35d"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="8b8a49a6-7909-422d-8d55-5f70503946fe"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="s.lustig@meinefirma.de"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="665922d4-e0b4-4f36-b907-0e0e73a1bffc"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="s.lustig@meinefirma.de"/>
-    </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea" />
-            </whereParams>
-        </delete>
-    </rollback>
-</changeSet>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
+    <changeSet author="j.hoermanns" id="88a254de-509f-4eba-a88d-8539ca8cd37f">
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="b5dd10e8-188d-477d-ae61-a3c36da643a8"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="lastModified"/>
+        <column name="PROPVAL" value="1544193908535"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="7f566326-c405-4238-8974-d92aafab0b80"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="contactID"/>
+        <column name="PROPVAL" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="1525c79d-2f48-4fa4-b2e7-1a5a6cb502e8"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="name"/>
+        <column name="PROPVAL" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="8ee8c986-72da-49d6-87eb-403b0994203a"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="title"/>
+        <column name="PROPVAL" value="Susanne Lustig"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="2360c964-f456-423c-83f7-79ec57aff10f"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="firstname"/>
+        <column name="PROPVAL" value="Susanne"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="504e660a-8c64-41e3-99c3-e39b5f2ee0ce"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="lastname"/>
+        <column name="PROPVAL" value="Lustig"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="ROLE"/>
+        <column name="ID" value="e753cd61-fcb6-4b89-8f29-93b875ccc388"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="roleNames"/>
+        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="e4d362f3-8bc3-4dd5-9b1c-d338017b5aaa"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="password"/>
+        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="a796eef7-72b6-435a-adbc-4e9356fcd35d"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="passwordChanged"/>
+        <column name="PROPVAL" value="1533122217399"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="8b8a49a6-7909-422d-8d55-5f70503946fe"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="email"/>
+        <column name="PROPVAL" value="s.lustig@meinefirma.de"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="665922d4-e0b4-4f36-b907-0e0e73a1bffc"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="calendarID"/>
+        <column name="PROPVAL" value="s.lustig@meinefirma.de"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="1ff6b066-12ba-4b01-a29e-0a84241a8b2c"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="isActive"/>
+        <column name="PROPVAL" value="true"/>
+    </insert>
+    <rollback>
+        <delete tableName="ASYS_USERS">
+            <where>NAME = ?</where>
+            <whereParams>
+                    <param value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea" />
+            </whereParams>
+        </delete>
+    </rollback>
+</changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/process/DataCaching_lib/process.js b/process/DataCaching_lib/process.js
index 2aee0dc32b167e0c11e2765cb44026dd6bbb96bd..8410bd42ceceb6760b8bc9645dfe445f23467a8a 100644
--- a/process/DataCaching_lib/process.js
+++ b/process/DataCaching_lib/process.js
@@ -66,8 +66,8 @@ CachedData.prototype.load = function(pDataCallbackFunction)
     //currently it's not possible to cache the data within the serer-context, so instead the Data-function is called everytime 
     if (this.runningOnServer)
         cachingEnabled = false;
-//    else if (JSON.parse(project.getInstanceConfigValue("custom.dataCaching.client.forceDisable")) == true)
-//        cachingEnabled = false;
+    else if (JSON.parse(project.getInstanceConfigValue("custom.dataCaching.client.forceDisable")) == true)
+        cachingEnabled = false;
 
     if (!cachingEnabled)
         return pDataCallbackFunction.call(this, this.keepPerLanguage, this.locale);