@@ -305,6 +305,16 @@ public static function getScreenByKey(string $key) : ?self
         return $screen;
     }
 
+    public static function getScreenByKeyNonSystem(string $key) : ?self
+    {
+        $screen = self::firstWhere('key', $key);
+        if (!$screen) {
+            $screen = self::createScreenByKey($key, false);
+        }
+
+        return $screen;
+    }
+
     private static function createScreenByKey(string $key, bool $isSystem = true, string $path = null): self
     {
         // If no path is provided, use the default path
 
@@ -14,6 +14,6 @@ class ScreenEmailSeeder extends Seeder
      */
     public function run()
     {
-        return Screen::getScreenByKey('default-email-task-notification');
+        return Screen::getScreenByKeyNonSystem('default-email-task-notification');
     }
 }
@@ -0,0 +1,54 @@
+<?php
+
+namespace Tests\Unit;
+
+use Database\Seeders\ScreenEmailSeeder;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use ProcessMaker\Models\Screen;
+use ProcessMaker\Models\ScreenCategory;
+use Tests\TestCase;
+
+class ScreenEmailSeederTest extends TestCase
+{
+    use RefreshDatabase;
+
+    private function upgrade()
+    {
+        $this->artisan('migrate', [
+            '--path' => 'upgrades/2025_07_08_151252_update_default_email_task_notification_screen_category.php',
+        ])->run();
+    }
+
+    public function test_seeder_creates_screen_without_system_flag()
+    {
+        $seeder = new ScreenEmailSeeder();
+        $seeder->run();
+
+        $screen = Screen::where('key', 'default-email-task-notification')->first();
+
+        $this->assertNotNull($screen);
+        $this->assertEquals('default-email-task-notification', $screen->key);
+
+        $systemCategory = ScreenCategory::where('name', 'System')->first();
+        if ($systemCategory) {
+            $this->assertFalse($screen->categories()->where('category_id', $systemCategory->id)->exists());
+        }
+
+        $this->assertNull($screen->screen_category_id);
+    }
+
+    public function test_get_screen_by_key_non_system_method()
+    {
+        $screen = Screen::getScreenByKeyNonSystem('default-email-task-notification');
+
+        $this->assertNotNull($screen);
+        $this->assertEquals('default-email-task-notification', $screen->key);
+
+        $systemCategory = ScreenCategory::where('name', 'System')->first();
+        if ($systemCategory) {
+            $this->assertFalse($screen->categories()->where('category_id', $systemCategory->id)->exists());
+        }
+
+        $this->assertNull($screen->screen_category_id);
+    }
+}
@@ -0,0 +1,54 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use ProcessMaker\Models\Screen;
+use ProcessMaker\Models\ScreenCategory;
+
+class UpdateDefaultEmailTaskNotificationScreenCategory extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // Find the default email task notification screen
+        $screen = Screen::where('key', 'default-email-task-notification')->first();
+
+        if ($screen) {
+            // Remove the screen from the System category
+            $systemCategory = ScreenCategory::where('is_system', 1)->first();
+
+            if ($systemCategory) {
+                $screen->categories()->detach($systemCategory->id);
+            }
+
+            // Set screen_category_id to null to remove any category association
+            $screen->update(['screen_category_id' => null]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // Find the default email task notification screen
+        $screen = Screen::where('key', 'default-email-task-notification')->first();
+
+        if ($screen) {
+            // Re-add the screen to the System category
+            $systemCategory = ScreenCategory::where('is_system', 1)->first();
+
+            if ($systemCategory) {
+                $screen->categories()->attach($systemCategory->id);
+                $screen->update(['screen_category_id' => $systemCategory->id]);
+            }
+        }
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ class ScreenEmailSeeder extends Seeder`
`14`	`14`	`*/`
`15`	`15`	`public function run()`
`16`	`16`	`{`
`17`		`- return Screen::getScreenByKey('default-email-task-notification');`
	`17`	`+ return Screen::getScreenByKeyNonSystem('default-email-task-notification');`
`18`	`18`	`}`
`19`	`19`	`}`