@@ -114,7 +114,7 @@ public function index(Request $request)
     public function store(Request $request, ScriptMicroserviceService $service)
     {
         $this->checkAuth($request);
-        $request->validate(ScriptExecutor::rules());
+        $request->validate(ScriptExecutor::rules(), ScriptExecutor::messages());
 
         $scriptExecutor = ScriptExecutor::create(
             $request->only((new ScriptExecutor())->getFillable())
@@ -180,7 +180,7 @@ public function store(Request $request, ScriptMicroserviceService $service)
     public function update(Request $request, ScriptExecutor $scriptExecutor, ScriptMicroserviceService $service)
     {
         $this->checkAuth($request);
-        $request->validate(ScriptExecutor::rules());
+        $request->validate(ScriptExecutor::rules($scriptExecutor), ScriptExecutor::messages());
 
         $original = $scriptExecutor->getAttributes();
 
 
@@ -178,7 +178,11 @@ public static function rules($existing = null)
         }
 
         return [
-            'title' => 'required',
+            'title' => [
+                'required',
+                Rule::unique('script_executors', 'title')
+                    ->where('language', request('language'))
+                    ->ignore($existing ? $existing->id : 'NULL')],
             'language' => [
                 'required',
                 Rule::in($allowedLanguages),
@@ -191,12 +195,20 @@ public static function rules($existing = null)
         ];
     }
 
+    public static function messages(): array
+    {
+        return [
+            'title.unique' => __("The Name for language :language has already been taken.",
+                ['language' => config("script-runners")[request('language')]["name"] ?? request('language')]),
+        ];
+    }
+
     public static function list($language = null, $forEditMode = false)
     {
         $list = [];
         $executors =
             self::active()->where('is_system', false)->orderBy('language', 'asc')
-            ->orderBy('created_at', 'asc');
+                ->orderBy('created_at', 'asc');
 
         if ($language) {
             $executors->where('language', $language);
 
@@ -2262,6 +2262,7 @@
   "The launchpad settings were saved.": "The launchpad settings were saved.",
   "The name field is required.": "The name field is required.",
   "The Name has already been taken.": "The Name has already been taken.",
+  "The Name for language :language has already been taken.": "The Name for language :language has already been taken.",
   "The name of the button": "The name of the button",
   "The Name of the data name": "The Name of the data name",
   "The name of the Download": "The name of the Download",
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function index(Request $request)`
`114`	`114`	`public function store(Request $request, ScriptMicroserviceService $service)`
`115`	`115`	`{`
`116`	`116`	`$this->checkAuth($request);`
`117`		`- $request->validate(ScriptExecutor::rules());`
	`117`	`+ $request->validate(ScriptExecutor::rules(), ScriptExecutor::messages());`
`118`	`118`
`119`	`119`	`$scriptExecutor = ScriptExecutor::create(`
`120`	`120`	`$request->only((new ScriptExecutor())->getFillable())`
`@@ -180,7 +180,7 @@ public function store(Request $request, ScriptMicroserviceService $service)`
`180`	`180`	`public function update(Request $request, ScriptExecutor $scriptExecutor, ScriptMicroserviceService $service)`
`181`	`181`	`{`
`182`	`182`	`$this->checkAuth($request);`
`183`		`- $request->validate(ScriptExecutor::rules());`
	`183`	`+ $request->validate(ScriptExecutor::rules($scriptExecutor), ScriptExecutor::messages());`
`184`	`184`
`185`	`185`	`$original = $scriptExecutor->getAttributes();`
`186`	`186`