diff --git a/core/domain_settings/app_languages.php b/core/domain_settings/app_languages.php
index e19f7c908d..fdfa4652ba 100644
--- a/core/domain_settings/app_languages.php
+++ b/core/domain_settings/app_languages.php
@@ -846,6 +846,30 @@ $text['label-multiple']['zh-cn'] = "多种的";
 $text['label-multiple']['ja-jp'] = "多数";
 $text['label-multiple']['ko-kr'] = "다수의";
 
+$text['label-default_settings']['en-us'] = "Default Settings";
+$text['label-default_settings']['en-gb'] = "Default Settings";
+$text['label-default_settings']['ar-eg'] = "الإعدادات الافتراضية";
+$text['label-default_settings']['de-at'] = "Standardeinstellungen";
+$text['label-default_settings']['de-ch'] = "Standardeinstellungen";
+$text['label-default_settings']['de-de'] = "Standardeinstellungen";
+$text['label-default_settings']['es-cl'] = "Condiciones Predeterminadas";
+$text['label-default_settings']['es-mx'] = "Condiciones Predeterminadas";
+$text['label-default_settings']['fr-ca'] = "Paramètres par défaut";
+$text['label-default_settings']['fr-fr'] = "Configurations par Défaut";
+$text['label-default_settings']['he-il'] = "הגדרות ברירת מחדל";
+$text['label-default_settings']['it-it'] = "Parametri di Default";
+$text['label-default_settings']['nl-nl'] = "Standaard instellingen";
+$text['label-default_settings']['pl-pl'] = "Ustawienia domyślne";
+$text['label-default_settings']['pt-br'] = "Configurações Padrão";
+$text['label-default_settings']['pt-pt'] = "Predefinições";
+$text['label-default_settings']['ro-ro'] = "Setări implicite";
+$text['label-default_settings']['ru-ru'] = "Настройки по умолчанию";
+$text['label-default_settings']['sv-se'] = "Standard Inställningar";
+$text['label-default_settings']['uk-ua'] = "Налаштування за замовчуванням";
+$text['label-default_settings']['zh-cn'] = "默认设置";
+$text['label-default_settings']['ja-jp'] = "デフォルトの設定";
+$text['label-default_settings']['ko-kr'] = "기본 설정";
+
 $text['select-global']['en-us'] = "Global";
 $text['select-global']['en-gb'] = "Global";
 $text['select-global']['ar-eg'] = "عالمي";
@@ -1206,4 +1230,4 @@ $text['description-domain-add']['zh-cn'] = "在下面输入域详细信息。";
 $text['description-domain-add']['ja-jp'] = "以下にドメインの詳細を入力します。";
 $text['description-domain-add']['ko-kr'] = "아래에 도메인 세부 정보를 입력하십시오.";
 
-?>
+?>
\ No newline at end of file
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 19627efa54..a5f400e835 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008 - 2022
+	Portions created by the Initial Developer are Copyright (C) 2008 - 2023
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
diff --git a/core/domain_settings/resources/classes/domain_settings.php b/core/domain_settings/resources/classes/domain_settings.php
index afe51d3a10..04a7c66626 100644
--- a/core/domain_settings/resources/classes/domain_settings.php
+++ b/core/domain_settings/resources/classes/domain_settings.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2019
+	Portions created by the Initial Developer are Copyright (C) 2019-2023
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -55,7 +55,7 @@ if (!class_exists('domain_settings')) {
 				$this->app_name = 'domain_settings';
 				$this->app_uuid = 'b31e723a-bf70-670c-a49b-470d2a232f71';
 				$this->permission_prefix = 'domain_setting_';
-				$this->list_page = PROJECT_PATH."/core/domains/domain_edit.php?id=".urlencode($this->domain_uuid);
+				$this->list_page = PROJECT_PATH."/core/domains/domain_edit.php?id=".urlencode($this->domain_uuid ?? '');
 				$this->table = 'domain_settings';
 				$this->uuid_prefix = 'domain_setting_';
 				$this->toggle_field = 'domain_setting_enabled';