diff --git a/system/libs/Settings.php b/system/libs/Settings.php
index a72b41e7..aaddf72f 100644
--- a/system/libs/Settings.php
+++ b/system/libs/Settings.php
@@ -438,6 +438,9 @@ class Settings implements ArrayAccess
 
 		// return specified plugin settings (all)
 		if(!isset($key)) {
+			if (!isset($this->settingsFile[$pluginKeyName]['settings'])) {
+				throw new RuntimeException('Unknown plugin settings: ' . $pluginKeyName);
+			}
 			return $this->settingsFile[$pluginKeyName]['settings'];
 		}
 
diff --git a/system/templates/account.create.html.twig b/system/templates/account.create.html.twig
index 3274178c..a43d6e7d 100644
--- a/system/templates/account.create.html.twig
+++ b/system/templates/account.create.html.twig
@@ -140,7 +140,7 @@
 														<span{% if errors.name is defined %} class="red"{% endif %}>Character Name:</span>
 													</td>
 													<td>
-														<input id="character_name" name="name" size="{{ setting('create_character_name_max_length') }}" maxlength="{{ setting('create_character_name_max_length') }}" value="{{ name }}"/>
+														<input id="character_name" name="name" size="{{ setting('core.create_character_name_max_length') }}" maxlength="{{ setting('core.create_character_name_max_length') }}" value="{{ name }}"/>
 														<img id="character_indicator" src="images/global/general/{% if not save or errors.name is defined %}n{% endif %}ok.gif" style="display: none;" />
 														<br>
 													</td>
diff --git a/system/templates/account.create_character.html.twig b/system/templates/account.create_character.html.twig
index afe4e9da..acb57f5c 100644
--- a/system/templates/account.create_character.html.twig
+++ b/system/templates/account.create_character.html.twig
@@ -45,7 +45,7 @@ In any case the name must not violate the naming conventions stated in the <a hr
 												</tr>
 												<tr class="Odd">
 													<td>
-														<input name="name" id="character_name" value="{{ name }}" size="{{ setting('create_character_name_max_length') }}" maxlength="{{ setting('create_character_name_max_length') }}" >
+														<input name="name" id="character_name" value="{{ name }}" size="{{ setting('core.create_character_name_max_length') }}" maxlength="{{ setting('core.create_character_name_max_length') }}" >
 														<img id="character_indicator" src="images/global/general/{% if not save or errors.name is defined %}n{% endif %}ok.gif" />
 														<br/>
 														<span style="font-size: 10px">