diff --git a/App_Data/app.xml b/App_Data/app.xml
index 7508255..65ac620 100644
--- a/App_Data/app.xml
+++ b/App_Data/app.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<SexyContent FileVersion="07.00.00" MinimumRequiredVersion="07.04.02" ModuleVersion="16.04.00" ExportDate="2023-08-23T18:05:32.3637239+02:00">
+<SexyContent FileVersion="07.00.00" MinimumRequiredVersion="07.04.02" ModuleVersion="16.07.00" ExportDate="2023-09-22T11:23:36.6515+02:00">
   <Header>
     <App Guid="fd3de96e-fe4c-4f8e-a83d-0a9cba898666" />
     <Language Default="en-us" />
diff --git a/live/Registration.cshtml b/live/Registration.cshtml
index de8e732..6fde009 100644
--- a/live/Registration.cshtml
+++ b/live/Registration.cshtml
@@ -35,7 +35,7 @@
 
 <div class="app-events6 app-events6-form" 
   @Kit.Edit.TagToolbar(eventDate) 
-  events-@MyContext.Module.Id
+  events-@UniqueKey
   data-string-required="@App.Resources.String("ValidationRequired")" 
   data-string-email="@App.Resources.String("ValidationEmail")"
   data-webservice="app/auto/@Edition/api/Form/ProcessForm"
diff --git a/live/shared/Assets.cshtml b/live/shared/Assets.cshtml
index 9245af5..d93f716 100644
--- a/live/shared/Assets.cshtml
+++ b/live/shared/Assets.cshtml
@@ -15,7 +15,7 @@
   };
 
   var data = new {
-   domAttribute = "events-" + MyContext.Module.Id,
+   domAttribute = "events-" + UniqueKey,
    options = pristineOptions
   };
 }
diff --git a/staging/Registration.cshtml b/staging/Registration.cshtml
index de8e732..6fde009 100644
--- a/staging/Registration.cshtml
+++ b/staging/Registration.cshtml
@@ -35,7 +35,7 @@
 
 <div class="app-events6 app-events6-form" 
   @Kit.Edit.TagToolbar(eventDate) 
-  events-@MyContext.Module.Id
+  events-@UniqueKey
   data-string-required="@App.Resources.String("ValidationRequired")" 
   data-string-email="@App.Resources.String("ValidationEmail")"
   data-webservice="app/auto/@Edition/api/Form/ProcessForm"
diff --git a/staging/shared/Assets.cshtml b/staging/shared/Assets.cshtml
index 9245af5..d93f716 100644
--- a/staging/shared/Assets.cshtml
+++ b/staging/shared/Assets.cshtml
@@ -15,7 +15,7 @@
   };
 
   var data = new {
-   domAttribute = "events-" + MyContext.Module.Id,
+   domAttribute = "events-" + UniqueKey,
    options = pristineOptions
   };
 }