diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7b95c9..5357ef5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ look forward and manitain only >=7.4 versions.
  - Fix #378: Add module attribute 'disableIpLogging' (jkmssoft)
  - Enh #387: Added Persian translation (hadi-aj)
  - Fix #384: Delete flash messages after consuming (cgsmith)
+ - Fix #381: Renamed events in `UserEvent` to avoid conflicts with events in `FormEvent` (Slayvin)
  - Enh: Added SK translations (snickom)
  - Fix: allow `password_changed_at` to be saved when reseting password (p4blojf)
  - Fix #430: Moved `EVENT_BEFORE_PROFILE_UPDATE` to correct place (eluhr)
diff --git a/src/User/Event/UserEvent.php b/src/User/Event/UserEvent.php
index 948c0bb..249fbe8 100644
--- a/src/User/Event/UserEvent.php
+++ b/src/User/Event/UserEvent.php
@@ -23,8 +23,8 @@ class UserEvent extends Event
     const EVENT_AFTER_CREATE = 'afterCreate';
     const EVENT_BEFORE_DELETE = 'beforeDelete';
     const EVENT_AFTER_DELETE = 'afterDelete';
-    const EVENT_BEFORE_REGISTER = 'beforeRegister';
-    const EVENT_AFTER_REGISTER = 'afterRegister';
+    const EVENT_BEFORE_REGISTER = 'beforeRegistration';
+    const EVENT_AFTER_REGISTER = 'afterRegistration';
     const EVENT_BEFORE_ACCOUNT_UPDATE = 'beforeAccountUpdate';
     const EVENT_AFTER_ACCOUNT_UPDATE = 'afterAccountUpdate';
     const EVENT_BEFORE_PROFILE_UPDATE = 'beforeProfileUpdate';