diff --git a/core/authentication/resources/classes/plugins/database.php b/core/authentication/resources/classes/plugins/database.php
index aad1fda3f2..7450a72843 100644
--- a/core/authentication/resources/classes/plugins/database.php
+++ b/core/authentication/resources/classes/plugins/database.php
@@ -52,6 +52,8 @@ class plugin_database {
 
 		//pre-process some settings
 			$settings['theme']['favicon'] = !empty($_SESSION['theme']['favicon']['text']) ? $_SESSION['theme']['favicon']['text'] : PROJECT_PATH.'/themes/default/favicon.ico';
+			$settings['login']['domain_name_visible'] = !empty($_SESSION['login']['domain_name_visible']['boolean']) ? $_SESSION['login']['domain_name_visible']['boolean'] : '';
+			$settings['login']['domain_name'] = !empty($_SESSION['login']['domain_name']) ? $_SESSION['login']['domain_name'] : '';
 			$settings['login']['destination'] = !empty($_SESSION['login']['destination']['text']) ? $_SESSION['login']['destination']['text'] : '';
 			$settings['users']['unique'] = !empty($_SESSION['users']['unique']['text']) ? $_SESSION['users']['unique']['text'] : '';
 			$settings['theme']['logo'] = !empty($_SESSION['theme']['logo']['text']) ? $_SESSION['theme']['logo']['text'] : PROJECT_PATH.'/themes/default/images/logo_login.png';
@@ -96,18 +98,20 @@ class plugin_database {
 					$view->assign("login_title", $text['button-login']);
 					$view->assign("label_username", $text['label-username']);
 					$view->assign("label_password", $text['label-password']);
+					$view->assign("label_domain", $text['label-domain']);
 					$view->assign("button_login", $text['button-login']);
 
 				//assign default values to the template
 					$view->assign("project_path", PROJECT_PATH);
 					$view->assign("login_destination_url", $settings['login']['destination']);
+					$view->assign("login_domain_name_visible", $settings['login']['domain_name_visible']);
+					$view->assign("login_domain_names", $settings['login']['domain_name']);
 					$view->assign("favicon", $settings['theme']['favicon']);
 					$view->assign("login_logo_width", $settings['theme']['login_logo_width']);
 					$view->assign("login_logo_height", $settings['theme']['login_logo_height']);
 					$view->assign("login_logo_source", $settings['theme']['logo']);
 					$view->assign("message_delay", $settings['theme']['message_delay']);
 					$view->assign("background_video", $settings['theme']['background_video']);
- 					//if (!empty($_SESSION['authentication']['plugin']['database']['authorized']) && $_SESSION['authentication']['plugin']['database']['authorized'] == 1 && !empty($_SESSION['username'])) {
 					if (!empty($_SESSION['username'])) {
 						$view->assign("login_password_description", $text['label-password_description']);
 						$view->assign("username", $_SESSION['username']);
@@ -135,6 +139,9 @@ class plugin_database {
 			//	exit;
 			//}
 
+
+
+
 		//add the authentication details
 			if (isset($_REQUEST["username"])) {
 				$this->username = $_REQUEST["username"];
@@ -143,22 +150,24 @@ class plugin_database {
 			if (isset($_REQUEST["password"])) {
 				$this->password = $_REQUEST["password"];
 			}
-			if (isset($_SESSION['username'])) {
-				$this->username = $_SESSION['username'];
-			}
 			if (isset($_REQUEST["key"])) {
 				$this->key = $_REQUEST["key"];
 			}
+			if (isset($_REQUEST["domain_name"])) {
+				$domain_name = $_REQUEST["domain_name"];
+				$this->domain_name = $_REQUEST["domain_name"];
+			}
 
 		//get the domain name
 			$auth = new authentication;
 			$auth->get_domain();
-			$this->domain_uuid = $_SESSION['domain_uuid'] ?? null;
-			$this->domain_name = $_SESSION['domain_name'] ?? null;
 			$this->username = $_SESSION['username'] ?? null;
+			//$this->domain_uuid = $_SESSION['domain_uuid'] ?? null;
+			//$this->domain_name = $_SESSION['domain_name'] ?? null;
 
 		//debug information
 			//echo "domain_uuid: ".$this->domain_uuid."<br />\n";
+			//view_array($this->domain_uuid, false);
 			//echo "domain_name: ".$this->domain_name."<br />\n";
 			//echo "username: ".$this->username."<br />\n";
 
@@ -329,4 +338,5 @@ class plugin_database {
 	}
 }
 
-?>
\ No newline at end of file
+?>
+
diff --git a/core/authentication/resources/views/login.htm b/core/authentication/resources/views/login.htm
index 23690ceab9..d32fb15ff7 100644
--- a/core/authentication/resources/views/login.htm
+++ b/core/authentication/resources/views/login.htm
@@ -77,6 +77,17 @@
 							<input type='text' class='txt login' style='text-align: center; min-width: 200px; width: 200px; margin-bottom: 8px;' name='username' id='username' placeholder="{$label_username}" /><br />
 						{/if}
 						<input type='password' class='txt login' style='text-align: center; min-width: 200px; width: 200px; margin-bottom: 8px;' name='password' placeholder="{$label_password}" /><br />
+						{if !empty($login_domain_name_visible) && $login_domain_name_visible == 'true'}
+							{if empty($login_domain_names)}
+								<input type='text' class='txt login' style='text-align: center; min-width: 200px; width: 200px; margin-bottom: 8px;' name='domain_name' id='domain_name' placeholder="{$label_domain}" /><br />
+							{else}
+								<select class='txt login' style='text-align: center; min-width: 200px; width: 200px; margin-bottom: 8px;' name="domain_name" id="domain_name">
+									{foreach from=$login_domain_names item=option}
+									<option value="{$option}">{$option}</option>
+									{/foreach}
+								</select>
+							{/if}
+						{/if}
 					</div>
 					<div>
 						<input type='submit' id='btn_login' class='btn' style='width: 100px; margin-top: 15px;' value='{$button_login}' />
@@ -91,3 +102,4 @@
 		<script>document.getElementsByName('username')[0].focus();</script>
 	</body>
 </html>
+