diff --git a/app/Events/ServerDeleted.php b/app/Events/Server/Created.php
similarity index 89%
rename from app/Events/ServerDeleted.php
rename to app/Events/Server/Created.php
index 95f8e33e1..d5a308876 100644
--- a/app/Events/ServerDeleted.php
+++ b/app/Events/Server/Created.php
@@ -22,11 +22,12 @@
  * SOFTWARE.
  */
 
-namespace Pterodactyl\Events;
+namespace Pterodactyl\Events\Server;
 
+use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class ServerDeleted
+class Created
 {
     use SerializesModels;
 
@@ -37,8 +38,8 @@ class ServerDeleted
      *
      * @return void
      */
-    public function __construct($id)
+    public function __construct(Server $server)
     {
-        $this->server = $id;
+        $this->server = $server;
     }
 }
diff --git a/app/Listeners/DeleteServerListener.php b/app/Events/Server/Creating.php
similarity index 60%
rename from app/Listeners/DeleteServerListener.php
rename to app/Events/Server/Creating.php
index 616f4c141..cbba63eb1 100644
--- a/app/Listeners/DeleteServerListener.php
+++ b/app/Events/Server/Creating.php
@@ -22,41 +22,24 @@
  * SOFTWARE.
  */
 
-namespace Pterodactyl\Listeners;
+namespace Pterodactyl\Events\Server;
 
-use Carbon;
-use Pterodactyl\Jobs\DeleteServer;
-use Pterodactyl\Jobs\SuspendServer;
-use Pterodactyl\Events\ServerDeleted;
-use Illuminate\Foundation\Bus\DispatchesJobs;
+use Pterodactyl\Models\Server;
+use Illuminate\Queue\SerializesModels;
 
-class DeleteServerListener
+class Creating
 {
-    use DispatchesJobs;
+    use SerializesModels;
+
+    public $server;
 
     /**
-     * Create the event listener.
+     * Create a new event instance.
      *
      * @return void
      */
-    public function __construct()
+    public function __construct(Server $server)
     {
-        //
-    }
-
-    /**
-     * Handle the event.
-     *
-     * @param  DeleteServerEvent  $event
-     * @return void
-     */
-    public function handle(ServerDeleted $event)
-    {
-        $this->dispatch((new SuspendServer($event->server))->onQueue(env('QUEUE_HIGH', 'high')));
-        $this->dispatch(
-            (new DeleteServer($event->server))
-            ->delay(Carbon::now()->addMinutes(env('APP_DELETE_MINUTES', 10)))
-            ->onQueue(env('QUEUE_STANDARD', 'standard'))
-        );
+        $this->server = $server;
     }
 }
diff --git a/app/Events/Server/Deleted.php b/app/Events/Server/Deleted.php
new file mode 100644
index 000000000..b36dca12d
--- /dev/null
+++ b/app/Events/Server/Deleted.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Events\Server;
+
+use Pterodactyl\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Deleted
+{
+    use SerializesModels;
+
+    public $server;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(Server $server)
+    {
+        $this->server = $server;
+    }
+}
diff --git a/app/Events/Server/Deleting.php b/app/Events/Server/Deleting.php
new file mode 100644
index 000000000..bb18e1ee9
--- /dev/null
+++ b/app/Events/Server/Deleting.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Events\Server;
+
+use Pterodactyl\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Deleting
+{
+    use SerializesModels;
+
+    public $server;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(Server $server)
+    {
+        $this->server = $server;
+    }
+}
diff --git a/app/Events/User/Created.php b/app/Events/User/Created.php
new file mode 100644
index 000000000..a00bdd450
--- /dev/null
+++ b/app/Events/User/Created.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Events\User;
+
+use Pterodactyl\Models\User;
+use Illuminate\Queue\SerializesModels;
+
+class Created
+{
+    use SerializesModels;
+
+    public $user;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}
diff --git a/app/Events/User/Creating.php b/app/Events/User/Creating.php
new file mode 100644
index 000000000..39a50f0c8
--- /dev/null
+++ b/app/Events/User/Creating.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Events\User;
+
+use Pterodactyl\Models\User;
+use Illuminate\Queue\SerializesModels;
+
+class Creating
+{
+    use SerializesModels;
+
+    public $user;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}
diff --git a/app/Events/User/Deleted.php b/app/Events/User/Deleted.php
new file mode 100644
index 000000000..348c859c9
--- /dev/null
+++ b/app/Events/User/Deleted.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Events\User;
+
+use Pterodactyl\Models\User;
+use Illuminate\Queue\SerializesModels;
+
+class Deleted
+{
+    use SerializesModels;
+
+    public $user;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}
diff --git a/app/Events/User/Deleting.php b/app/Events/User/Deleting.php
new file mode 100644
index 000000000..5bbd91366
--- /dev/null
+++ b/app/Events/User/Deleting.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Events\User;
+
+use Pterodactyl\Models\User;
+use Illuminate\Queue\SerializesModels;
+
+class Deleting
+{
+    use SerializesModels;
+
+    public $user;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}
diff --git a/app/Models/Node.php b/app/Models/Node.php
index 5b82a2429..a5cbce464 100644
--- a/app/Models/Node.php
+++ b/app/Models/Node.php
@@ -26,9 +26,12 @@ namespace Pterodactyl\Models;
 
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Notifications\Notifiable;
 
 class Node extends Model
 {
+    use Notifiable;
+
     /**
      * The table associated with the model.
      *
diff --git a/app/Models/Server.php b/app/Models/Server.php
index b90d0c510..3a11603c2 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -26,11 +26,12 @@ namespace Pterodactyl\Models;
 
 use Auth;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Server extends Model
 {
-    use SoftDeletes;
+    use Notifiable, SoftDeletes;
 
     /**
      * The table associated with the model.
diff --git a/app/Notifications/ServerCreated.php b/app/Notifications/ServerCreated.php
index a581a8fb2..a8e8b59f0 100644
--- a/app/Notifications/ServerCreated.php
+++ b/app/Notifications/ServerCreated.php
@@ -1,4 +1,26 @@
 <?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 
 namespace Pterodactyl\Notifications;
 
diff --git a/app/Observers/ServerObserver.php b/app/Observers/ServerObserver.php
new file mode 100644
index 000000000..82c403a8a
--- /dev/null
+++ b/app/Observers/ServerObserver.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Observers;
+
+use Carbon;
+use Pterodactyl\Events;
+use Pterodactyl\Models\Server;
+use Pterodactyl\Jobs\DeleteServer;
+use Pterodactyl\Jobs\SuspendServer;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+
+class ServerObserver
+{
+    use DispatchesJobs;
+
+    /**
+     * Listen to the Server deleted event.
+     *
+     * @param  Server $server [description]
+     * @return [type]         [description]
+     */
+    public function creating(Server $server)
+    {
+        event(new Events\Server\Creating($server));
+    }
+
+    /**
+     * Listen to the Server deleted event.
+     *
+     * @param  Server $server [description]
+     * @return [type]         [description]
+     */
+    public function created(Server $server)
+    {
+        event(new Events\Server\Created($server));
+    }
+
+    /**
+     * Listen to the Server deleted event.
+     *
+     * @param  Server $server [description]
+     * @return [type]         [description]
+     */
+    public function deleting(Server $server)
+    {
+        event(new Events\Server\Deleting($server));
+
+        $this->dispatch((new SuspendServer($server->id))->onQueue(env('QUEUE_HIGH', 'high')));
+    }
+
+    /**
+     * Listen to the Server deleted event.
+     *
+     * @param  Server $server [description]
+     * @return [type]         [description]
+     */
+    public function deleted(Server $server)
+    {
+        event(new Events\Server\Deleted($server));
+
+        $this->dispatch(
+            (new DeleteServer($server->id))
+            ->delay(Carbon::now()->addMinutes(env('APP_DELETE_MINUTES', 10)))
+            ->onQueue(env('QUEUE_STANDARD', 'standard'))
+        );
+    }
+}
diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php
new file mode 100644
index 000000000..e0624e268
--- /dev/null
+++ b/app/Observers/UserObserver.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Observers;
+
+use Pterodactyl\Events;
+use Pterodactyl\Models\User;
+
+class UserObserver
+{
+    /**
+     * Listen to the User creating event.
+     *
+     * @param  User $user The eloquent User model.
+     * @return void
+     */
+    public function creating(User $user)
+    {
+        event(new Events\User\Creating($user));
+    }
+
+    /**
+     * Listen to the User created event.
+     *
+     * @param  User $user The eloquent User model.
+     * @return void
+     */
+    public function created(User $user)
+    {
+        event(new Events\User\Created($user));
+    }
+
+    /**
+     * Listen to the User deleting event.
+     *
+     * @param  User $user The eloquent User model.
+     * @return void
+     */
+    public function deleting(User $user)
+    {
+        event(new Events\User\Deleting($user));
+    }
+
+    /**
+     * Listen to the User deleted event.
+     *
+     * @param  User $user The eloquent User model.
+     * @return void
+     */
+    public function deleted(User $user)
+    {
+        event(new Events\User\Deleted($user));
+    }
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index d0d1dd9e4..d71ea056b 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -1,8 +1,34 @@
 <?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 
 namespace Pterodactyl\Providers;
 
+use Pterodactyl\Models\User;
+use Pterodactyl\Models\Server;
 use Illuminate\Support\ServiceProvider;
+use Pterodactyl\Observers\UserObserver;
+use Pterodactyl\Observers\ServerObserver;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -13,7 +39,8 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        User::observe(UserObserver::class);
+        Server::observe(ServerObserver::class);
     }
 
     /**
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 7ec0d48ae..0e31100c3 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -12,11 +12,7 @@ class EventServiceProvider extends ServiceProvider
      *
      * @var array
      */
-    protected $listen = [
-        'Pterodactyl\Events\ServerDeleted' => [
-            'Pterodactyl\Listeners\DeleteServerListener',
-        ],
-    ];
+    protected $listen = [];
 
     /**
      * Register any other events for your application.
diff --git a/app/Repositories/ServerRepository.php b/app/Repositories/ServerRepository.php
index 88618a476..9f762bc4a 100644
--- a/app/Repositories/ServerRepository.php
+++ b/app/Repositories/ServerRepository.php
@@ -29,7 +29,6 @@ use Log;
 use Crypt;
 use Validator;
 use Pterodactyl\Models;
-use Pterodactyl\Events\ServerDeleted;
 use Pterodactyl\Services\UuidService;
 use Pterodactyl\Services\DeploymentService;
 use Pterodactyl\Exceptions\DisplayException;
@@ -797,9 +796,7 @@ class ServerRepository
             }
 
             $server->delete();
-            DB::commit();
-
-            event(new ServerDeleted($server->id));
+            return DB::commit();
         } catch (\Exception $ex) {
             DB::rollBack();
             throw $ex;