diff --git a/app/Events/Load_config.php b/app/Events/Load_config.php
index b14417f87..ee69c3aab 100644
--- a/app/Events/Load_config.php
+++ b/app/Events/Load_config.php
@@ -41,7 +41,7 @@ class Load_config
 		//Language
 		$language_exists = file_exists('../app/Language/' . current_language_code());
 
-		if(current_language_code() == null || current_language() == null || !$language_exists)	//TODO: current_language() is undefined
+		if(current_language_code() == null || current_language() == null || !$language_exists)
 		{
 			$config->settings['language'] = 'english';
 			$config->settings['language_code'] = 'en';
diff --git a/app/Helpers/locale_helper.php b/app/Helpers/locale_helper.php
index a1def3ae5..5a3b4cc21 100644
--- a/app/Helpers/locale_helper.php
+++ b/app/Helpers/locale_helper.php
@@ -1,54 +1,30 @@
 <?php
 use App\Models\Employee;
 use Config\OSPOS;
+	use Config\Services;
 
 /**
  * Returns the currently configured language code.
  *
- * @param bool $load_system_language When true, the system language is returned.
  * @return string Returns the default language code if a language code is not configured.
  */
-function current_language_code(bool $load_system_language = false): string
+function current_language_code(): string
 {
-	$employee = model(Employee::class);
-	$config = config(OSPOS::class)->settings;
+	$config = config(OSPOS::class);
 
-	if($employee->is_logged_in() && !$load_system_language)
-	{
-		$employee_info = $employee->get_logged_in_employee_info();
-
-		if(property_exists($employee_info, 'language_code') && !empty($employee_info->language_code))
-		{
-			return $employee_info->language_code;
-		}
-	}
-
-	$language_code = $config['language_code'];
+	$language_code = $config->settings['language_code'];
 
 	return empty($language_code) ? DEFAULT_LANGUAGE_CODE : $language_code;
 }
 
 /**
- * @param bool $load_system_language
  * @return string
  */
-function current_language(bool $load_system_language = false): string
+function current_language(): string
 {
-	$employee = model(Employee::class);
-	$config = config(OSPOS::class)->settings;
+	$config = config(OSPOS::class);
 
-	// Returns the language of the employee if set or system language if not
-	if($employee->is_logged_in() && !$load_system_language)
-	{
-		$employee_info = $employee->get_logged_in_employee_info();
-
-		if(property_exists($employee_info, 'language') && !empty($employee_info->language))
-		{
-			return $employee_info->language;
-		}
-	}
-
-	$language = $config['language'];
+	$language = $config->settings['language'];
 
 	return empty($language) ? DEFAULT_LANGUAGE : $language;
 }