diff --git a/cp/app/Controllers/SystemController.php b/cp/app/Controllers/SystemController.php
index f0c6ca9..4e4b0a5 100644
--- a/cp/app/Controllers/SystemController.php
+++ b/cp/app/Controllers/SystemController.php
@@ -385,13 +385,13 @@ class SystemController extends Controller
                     $idntable = '/^(?!-)(?!.*--)[A-Z0-9-]{1,63}(?<!-)(.(?!-)(?!.*--)[A-Z0-9-]{1,63}(?<!-))*$/i';
                     break;
                 case 'cyrillic':
-                    $idntable = '/^[а-яА-ЯґҐєЄіІїЇѝЍћЋљЈ]+$/u';
+                    $idntable = '/^[а-яА-ЯґҐєЄіІїЇѝЍћЋљЈ0-9\'ѫѣѭ]+$/u';
                     break;
                 case 'japanese':
-                    $idntable = '/^[ぁ-んァ-ン一-龯々]+$/u';
+                    $idntable = '/^[ぁ-んァ-ン一-龯々0-9]+$/u';
                     break;
                 case 'korean':
-                    $idntable = '/^[가-힣]+$/u';
+                    $idntable = '/^[가-힣0-9]+$/u';
                     break;
                 default:
                     $idntable = '/^(?!-)(?!.*--)[A-Z0-9-]{1,63}(?<!-)(.(?!-)(?!.*--)[A-Z0-9-]{1,63}(?<!-))*$/i';
diff --git a/cp/resources/views/partials/js-tlds.twig b/cp/resources/views/partials/js-tlds.twig
index a05d07f..7788c39 100644
--- a/cp/resources/views/partials/js-tlds.twig
+++ b/cp/resources/views/partials/js-tlds.twig
@@ -30,9 +30,9 @@
     // Mapping of database string values to script names
     const dbValueToScriptName = {
         '/^(?!-)(?!.*--)[A-Z0-9-]{1,63}(?<!-)(.(?!-)(?!.*--)[A-Z0-9-]{1,63}(?<!-))*$/i': 'ASCII',
-        '/^[а-яА-ЯґҐєЄіІїЇѝЍћЋљЈ]+$/u': 'Cyrillic',
-        '/^[ぁ-んァ-ン一-龯々]+$/u': 'Japanese',
-        '/^[가-힣]+$/u': 'Korean',
+        '/^[а-яА-ЯґҐєЄіІїЇѝЍћЋљЈ0-9\'ѫѣѭ]+$/u': 'Cyrillic',
+        '/^[ぁ-んァ-ン一-龯々0-9]+$/u': 'Japanese',
+        '/^[가-힣0-9]+$/u': 'Korean',
     };
     
     const scriptNameToBadgeClass = {