diff --git a/includes/checkauth.php b/includes/checkauth.php
index 01013ad670..72a00b8dcc 100644
--- a/includes/checkauth.php
+++ b/includes/checkauth.php
@@ -44,6 +44,20 @@ session_start();
 				exit;
 			}
 
+		//get the domain name
+			if (strlen(check_str($_REQUEST["domain_name"])) > 0) {
+				$domain_name = check_str($_REQUEST["domain_name"]);
+				$_SESSION["domain_name"] = $domain_name;
+				foreach ($_SESSION['domains'] as &$row) {
+					if ($row['domain_name'] == $domain_name) {
+						$domain_uuid = $row["domain_uuid"];
+						$_SESSION["domain_uuid"] = $row["domain_uuid"];
+						$_SESSION['domains'][$row['domain_uuid']]['domain_uuid'] = $row['domain_uuid'];
+						$_SESSION['domains'][$row['domain_uuid']]['domain_name'] = $domain_name;
+					}
+				}
+			}
+
 		//check the username and password if they don't match then redirect to the login
 			$sql = "select * from v_users ";
 			$sql .= "where domain_uuid=:domain_uuid ";
diff --git a/login.php b/login.php
index 2b1201026a..c93bf5af6c 100644
--- a/login.php
+++ b/login.php
@@ -82,20 +82,30 @@ echo "<td align='left'>\n";
 echo "	<strong>UserName:</strong>\n";
 echo "</td>\n";
 echo "<td>\n";
-echo "  <input type=\"text\" style='width: 125px;' class='formfld' name=\"username\">\n";
+echo "  <input type=\"text\" style='width: 150px;' class='formfld' name=\"username\">\n";
 echo "</td>\n";
 echo "</tr>\n";
-echo "\n";
+
 echo "<tr>\n";
 echo "<td align='left'>\n";
 echo "	<strong>Password:</strong>\n";
 echo "</td>\n";
-echo "\n";
 echo "<td align='left'>\n";
-echo "	<input type=\"password\" style='width: 125px;' class='formfld' name=\"password\">\n";
+echo "	<input type=\"password\" style='width: 150px;' class='formfld' name=\"password\">\n";
 echo "</td>\n";
 echo "</tr>\n";
-echo "\n";
+
+if ($_SESSION['security']['login']['domain_name'] == "true") {
+	echo "<tr>\n";
+	echo "<td align='left'>\n";
+	echo "	<strong>Domain:</strong>\n";
+	echo "</td>\n";
+	echo "<td>\n";
+	echo "  <input type=\"text\" style='width: 150px;' class='formfld' name=\"domain_name\">\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+}
+
 echo "<tr>\n";
 echo "<td>\n";
 echo "</td>\n";