diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 71b5ecf..6b2cf82 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -720,6 +720,11 @@ parameters:
 			count: 1
 			path: src/Admin/Models/StatusHistory.php
 
+		-
+			message: "#^Call to an undefined static method Igniter\\\\Admin\\\\Models\\\\Status\\:\\:find\\(\\)\\.$#"
+			count: 1
+			path: src/Admin/Models/StatusHistory.php
+
 		-
 			message: "#^Call to an undefined static method Igniter\\\\Admin\\\\Models\\\\StatusHistory\\:\\:where\\(\\)\\.$#"
 			count: 1
diff --git a/src/Admin/Models/StatusHistory.php b/src/Admin/Models/StatusHistory.php
index 1a9ea57..d730462 100644
--- a/src/Admin/Models/StatusHistory.php
+++ b/src/Admin/Models/StatusHistory.php
@@ -79,6 +79,10 @@ public function getNotifiedAttribute()
      */
     public static function createHistory($status, $object, $options = [])
     {
+        if (!$status instanceof Status) {
+            $status = Status::find($status);
+        }
+
         $statusId = $status->getKey();
         $previousStatus = $object->getOriginal('status_id');
 
diff --git a/src/Main/Providers/FormServiceProvider.php b/src/Main/Providers/FormServiceProvider.php
index df1d075..3c5b3ae 100644
--- a/src/Main/Providers/FormServiceProvider.php
+++ b/src/Main/Providers/FormServiceProvider.php
@@ -3,17 +3,12 @@
 namespace Igniter\Main\Providers;
 
 use Igniter\Admin\Classes\Widgets;
-use Igniter\Flame\Igniter;
 use Illuminate\Support\ServiceProvider;
 
 class FormServiceProvider extends ServiceProvider
 {
     public function register()
     {
-        if (!Igniter::runningInAdmin()) {
-            return;
-        }
-
         resolve(Widgets::class)->registerFormWidgets(function(Widgets $manager) {
             $manager->registerFormWidget(\Igniter\Main\FormWidgets\Components::class, [
                 'label' => 'Components',
@@ -31,4 +26,4 @@ public function register()
             ]);
         });
     }
-}
\ No newline at end of file
+}