diff --git a/scadalts-ui/src/locales/en.json b/scadalts-ui/src/locales/en.json
index 56788968b0..4f075ce124 100644
--- a/scadalts-ui/src/locales/en.json
+++ b/scadalts-ui/src/locales/en.json
@@ -1063,5 +1063,6 @@
 	"systemsettings.webresource.uploads.path": "Uploaded images save path",
 	"systemsettings.webresource.graphics.path": "Custom Graphics images path",
 	"systemsettings.webresource.uploads.path.wrong":"Uploaded images save path must end with 'uploads' or 'uploads{0}' ",
-	"systemsettings.webresource.graphics.path.wrong": "Custom Graphics images path must end with 'graphics' or 'graphics{0}' "
+	"systemsettings.webresource.graphics.path.wrong": "Custom Graphics images path must end with 'graphics' or 'graphics{0}' ",
+	"systemsettings.misc.eventAssignEnabled": "Event Assign enabled"
 }
diff --git a/scadalts-ui/src/views/System/SystemSettings/MiscSettingsComponent.vue b/scadalts-ui/src/views/System/SystemSettings/MiscSettingsComponent.vue
index 81259eb23f..28b30ab677 100644
--- a/scadalts-ui/src/views/System/SystemSettings/MiscSettingsComponent.vue
+++ b/scadalts-ui/src/views/System/SystemSettings/MiscSettingsComponent.vue
@@ -109,6 +109,13 @@
                           :rules="[validateUploadsPath]"
                       ></v-text-field>
                     </v-col>
+                    <v-col cols="12">
+                      <v-switch
+                          v-model="miscSettings.eventAssignEnabled"
+                          :label="$t('systemsettings.misc.eventAssignEnabled')"
+                          @change="watchDataChange()"
+                      ></v-switch>
+                    </v-col>
                 </v-row>
 			</v-card-text>
 		</v-card>