diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index f95c0d3cbf3d..8a59ad95f19c 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -14,6 +14,7 @@ namespace App\Exceptions;
 use App\Exceptions\FilePermissionsFailure;
 use App\Exceptions\InternalPDFFailure;
 use App\Exceptions\PhantomPDFFailure;
+use App\Utils\Ninja;
 use Exception;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\AuthenticationException;
@@ -75,7 +76,26 @@ class Handler extends ExceptionHandler
             return;
         }
 
-        if (app()->bound('sentry') && $this->shouldReport($exception)) {
+        if(Ninja::isHosted()){
+
+            app('sentry')->configureScope(function (Scope $scope): void {
+
+                if(auth()->guard('contact') && auth()->guard('contact')->user())
+                    $key = auth()->guard('contact')->user()->company->account->key;
+                elseif (auth()->guard('user') && auth()->guard('user')->user()) 
+                    $key = auth()->user()->account->key;
+                else
+                    $key = 'Anonymous';
+                
+                 $scope->setUser([
+                        'id'    => 'Hosted_User',
+                        'email' => 'hosted@invoiceninja.com',
+                        'name'  => $key,
+                    ]);
+            });
+
+        }
+        elseif (app()->bound('sentry') && $this->shouldReport($exception)) {
             app('sentry')->configureScope(function (Scope $scope): void {
                 if (auth()->guard('contact') && auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) {
                     $scope->setUser([
diff --git a/app/Listeners/User/UpdateUserLastLogin.php b/app/Listeners/User/UpdateUserLastLogin.php
index 266113b26909..fa087be5e4a3 100644
--- a/app/Listeners/User/UpdateUserLastLogin.php
+++ b/app/Listeners/User/UpdateUserLastLogin.php
@@ -67,8 +67,10 @@ class UpdateUserLastLogin implements ShouldQueue
             $user->save();
         }
 
+        $arr = json_encode(['ip' => $ip]);
+
         SystemLogger::dispatch(
-            $ip,
+            $arr,
             SystemLog::CATEGORY_SECURITY,
             SystemLog::EVENT_USER,
             SystemLog::TYPE_LOGIN_SUCCESS,