diff --git a/framework/core/src/Core/Command/RegisterUserHandler.php b/framework/core/src/Core/Command/RegisterUserHandler.php
index e4a29572b..8daa54e19 100644
--- a/framework/core/src/Core/Command/RegisterUserHandler.php
+++ b/framework/core/src/Core/Command/RegisterUserHandler.php
@@ -124,6 +124,10 @@ class RegisterUserHandler
             }
         }
 
+        if ($actor->isAdmin()) {
+            $user->activate();
+        }
+
         $this->events->fire(
             new UserWillBeSaved($user, $actor, $data)
         );
diff --git a/framework/core/src/Core/User.php b/framework/core/src/Core/User.php
index 108d250a1..40ad35a0b 100755
--- a/framework/core/src/Core/User.php
+++ b/framework/core/src/Core/User.php
@@ -352,9 +352,11 @@ class User extends AbstractModel
      */
     public function activate()
     {
-        $this->is_activated = true;
+        if ($this->is_activated !== true) {
+            $this->is_activated = true;
 
-        $this->raise(new UserWasActivated($this));
+            $this->raise(new UserWasActivated($this));
+        }
 
         return $this;
     }