diff --git a/index.php b/index.php
index 09c22b5662..b2e7f7e267 100644
--- a/index.php
+++ b/index.php
@@ -28,11 +28,14 @@ if (!file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/includes/config.php"))
 	header("Location: ".PROJECT_PATH."/resources/install.php");
 	exit;
 }
-require_once "includes/require.php";
-require_once "includes/header.php";
 
-echo "<br />";
-echo "<br />";
-
-require_once "includes/footer.php";
+if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/index.php")){
+	require_once "themes/".$_SESSION['domain']['template']['name']."/index.php";
+}
+else {
+	require_once "includes/require.php";
+	require_once "includes/header.php";
+	echo "<br /><br />\n";
+	require_once "includes/footer.php";
+}
 ?>
\ No newline at end of file
diff --git a/login.php b/login.php
index 9c28d6adce..ccac639b80 100644
--- a/login.php
+++ b/login.php
@@ -33,124 +33,12 @@ include "root.php";
 //adds multiple includes
 	require_once "includes/require.php";
 
-//add multi-lingual support
-	require_once "core/user_settings/app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
+//include the login
+	if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/login.php")){
+		require_once "themes/".$_SESSION['domain']['template']['name']."/login.php";
+	}
+	else {
+		require_once "resources/login.php";
 	}
 
-//get the http values and set as variables
-	$path = check_str($_GET["path"]);
-	$msg = check_str($_GET["msg"]);
-
-//set a default login destination
-	if (strlen($_SESSION['login']['destination']['url']) == 0) {
-		$_SESSION['login']['destination']['url'] = PROJECT_PATH."/core/user_settings/user_dashboard.php";
-	}
-
-//add the header
-	include "includes/header.php";
-
-//show the message
-	if (strlen($msg) > 0) {
-		echo "<br><br>";
-		echo "<div align='center'>\n";
-		echo "<table width='50%'>\n";
-		echo "<tr>\n";
-		echo "<th align='left'>Message</th>\n";
-		echo "</tr>\n";
-		echo "<tr>\n";
-		echo "<td class='row_style1'>\n";
-
-		switch ($msg) {
-			case "username required":
-				echo "<strong>Please provide a username.</strong>";
-				break;
-			case "incorrect account information":
-			   echo "<strong>The username or password was incorrect. Please try again.</strong>";
-				break;
-			case "install complete":
-				echo "<br />\n";
-				echo "Installation is complete. <br />";
-				echo "<br /> ";
-				echo  "<strong>Getting Started:</strong><br /> ";
-				echo "<ul><li>There are two levels of admins 1. superadmin 2. admin.<br />";
-				echo "<br />\n";
-				echo "username: <strong>superadmin</strong> <br />password: <strong>fusionpbx</strong> <br />\n";
-				echo "<br />\n";
-				echo "username: <strong>admin</strong> <br />password: <strong>fusionpbx</strong> <br/><br/>\n";
-				echo "</li>\n";
-				echo "<li>\n";
-				echo "The database connection settings have been saved to ".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/config.php.<br />\n";
-				echo "</li>\n";
-				echo "</ul>\n";
-				echo "<strong>\n";
-				break;
-		}
-
-		echo "</td>\n";
-		echo "</tr>\n";
-		echo "</table>\n";
-		echo "</div>\n";
-		echo "<br /><br />\n\n";
-	}
-
-//show the content
-	echo "<br><br>";
-	echo "<div align='center'>\n";
-	echo "<form name='login' METHOD=\"POST\" action=\"".$_SESSION['login']['destination']['url']."\">\n";
-	echo "<input type='hidden' name='path' value='$path'>\n";
-	echo "<table width='200' border='0'>\n";
-	echo "<tr>\n";
-	echo "<td align='left'>\n";
-	echo "	<strong>".$text['label-username'].":</strong>\n";
-	echo "</td>\n";
-	echo "<td>\n";
-	echo "  <input type=\"text\" style='width: 150px;' class='formfld' name=\"username\">\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td align='left'>\n";
-	echo "	<strong>".$text['label-password'].":</strong>\n";
-	echo "</td>\n";
-	echo "<td align='left'>\n";
-	echo "	<input type=\"password\" style='width: 150px;' class='formfld' name=\"password\">\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	if ($_SESSION['login']['domain_name.visible']['boolean'] == "true") {
-		echo "<tr>\n";
-		echo "<td align='left'>\n";
-		echo "	<strong>".$text['label-domain'].":</strong>\n";
-		echo "</td>\n";
-		echo "<td>\n";
-		if (count($_SESSION['login']['domain_name']) > 0) {
-			echo "    <select style='width: 150px;' class='formfld' name='domain_name'>\n";
-			echo "    <option value=''></option>\n";
-			foreach ($_SESSION['login']['domain_name'] as &$row) {
-				echo "    <option value='$row'>$row</option>\n";
-			}
-			echo "    </select>\n";
-		}
-		else {
-			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";
-	echo "<td align=\"right\">\n";
-	echo "  <input type=\"submit\" class='btn' value=\"".$text['button-login']."\">\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-	echo "</table>\n";
-	echo "</form>";
-	echo "</div>";
-
-//add the footer
-	include "includes/footer.php";
 ?>
\ No newline at end of file
diff --git a/resources/login.php b/resources/login.php
new file mode 100644
index 0000000000..be76faf6d4
--- /dev/null
+++ b/resources/login.php
@@ -0,0 +1,146 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+//add multi-lingual support
+	require_once "core/user_settings/app_languages.php";
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];
+	}
+
+//get the http values and set as variables
+	$path = check_str($_GET["path"]);
+	$msg = check_str($_GET["msg"]);
+
+//set a default login destination
+	if (strlen($_SESSION['login']['destination']['url']) == 0) {
+		$_SESSION['login']['destination']['url'] = PROJECT_PATH."/core/user_settings/user_dashboard.php";
+	}
+
+//add the header
+	include "includes/header.php";
+
+//show the message
+	if (strlen($msg) > 0) {
+		echo "<br><br>";
+		echo "<div align='center'>\n";
+		echo "<table width='50%'>\n";
+		echo "<tr>\n";
+		echo "<th align='left'>Message</th>\n";
+		echo "</tr>\n";
+		echo "<tr>\n";
+		echo "<td class='row_style1'>\n";
+		switch ($msg) {
+			case "username required":
+				echo "<strong>Please provide a username.</strong>";
+				break;
+			case "incorrect account information":
+			   echo "<strong>The username or password was incorrect. Please try again.</strong>";
+				break;
+			case "install complete":
+				echo "<br />\n";
+				echo "Installation is complete. <br />";
+				echo "<br /> ";
+				echo  "<strong>Getting Started:</strong><br /> ";
+				echo "<ul><li>There are two levels of admins 1. superadmin 2. admin.<br />";
+				echo "<br />\n";
+				echo "username: <strong>superadmin</strong> <br />password: <strong>fusionpbx</strong> <br />\n";
+				echo "<br />\n";
+				echo "username: <strong>admin</strong> <br />password: <strong>fusionpbx</strong> <br/><br/>\n";
+				echo "</li>\n";
+				echo "<li>\n";
+				echo "The database connection settings have been saved to ".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/config.php.<br />\n";
+				echo "</li>\n";
+				echo "</ul>\n";
+				echo "<strong>\n";
+				break;
+		}
+		echo "</td>\n";
+		echo "</tr>\n";
+		echo "</table>\n";
+		echo "</div>\n";
+		echo "<br /><br />\n\n";
+	}
+
+//show the content
+	echo "<br><br>";
+	echo "<div align='center'>\n";
+	echo "<form name='login' METHOD=\"POST\" action=\"".$_SESSION['login']['destination']['url']."\">\n";
+	echo "<input type='hidden' name='path' value='$path'>\n";
+	echo "<table width='200' border='0'>\n";
+	echo "<tr>\n";
+	echo "<td align='left'>\n";
+	echo "	<strong>".$text['label-username'].":</strong>\n";
+	echo "</td>\n";
+	echo "<td>\n";
+	echo "  <input type=\"text\" style='width: 150px;' class='formfld' name=\"username\">\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td align='left'>\n";
+	echo "	<strong>".$text['label-password'].":</strong>\n";
+	echo "</td>\n";
+	echo "<td align='left'>\n";
+	echo "	<input type=\"password\" style='width: 150px;' class='formfld' name=\"password\">\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	if ($_SESSION['login']['domain_name.visible']['boolean'] == "true") {
+		echo "<tr>\n";
+		echo "<td align='left'>\n";
+		echo "	<strong>".$text['label-domain'].":</strong>\n";
+		echo "</td>\n";
+		echo "<td>\n";
+		if (count($_SESSION['login']['domain_name']) > 0) {
+			echo "    <select style='width: 150px;' class='formfld' name='domain_name'>\n";
+			echo "    <option value=''></option>\n";
+			foreach ($_SESSION['login']['domain_name'] as &$row) {
+				echo "    <option value='$row'>$row</option>\n";
+			}
+			echo "    </select>\n";
+		}
+		else {
+			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";
+	echo "<td align=\"right\">\n";
+	echo "  <input type=\"submit\" class='btn' value=\"".$text['button-login']."\">\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+	echo "</table>\n";
+	echo "</form>";
+	echo "</div>";
+
+//add the footer
+	include "includes/footer.php";
+
+?>
\ No newline at end of file