diff --git a/e107_core/shortcodes/batch/login_shortcodes.php b/e107_core/shortcodes/batch/login_shortcodes.php
index f481e027c..666e1b9a3 100644
--- a/e107_core/shortcodes/batch/login_shortcodes.php
+++ b/e107_core/shortcodes/batch/login_shortcodes.php
@@ -42,13 +42,13 @@ class login_shortcodes extends e_shortcode
 		$placeholder =  $ulabel[$allowEmailLogin];	
 		
 		
-		return "<input class='tbox input-block-level' type='text' name='username' id='username' size='40' maxlength='100' placeholder=\"".$placeholder."\"  />";
+		return "<input class='tbox form-control input-block-level' type='text' name='username' id='username' size='40' maxlength='100' placeholder=\"".$placeholder."\"  />";
 	}
 	
 	function sc_login_table_password($parm='') //FIXME use $frm
 	{
 		$pref = e107::getPref();
-		$text = "<input class='tbox  input-block-level' type='password' name='userpass' id='userpass' size='40' maxlength='100' placeholder=\"".LAN_LOGIN_2."\" />";
+		$text = "<input class='tbox form-control input-block-level' type='password' name='userpass' id='userpass' size='40' maxlength='100' placeholder=\"".LAN_LOGIN_2."\" />";
 		
 		if (!USER && e107::getSession()->is('challenge') && varset($pref['password_CHAP'],0)) 
 		{
diff --git a/e107_core/templates/login_template.php b/e107_core/templates/login_template.php
index 93af8bd07..fc56a3fb9 100644
--- a/e107_core/templates/login_template.php
+++ b/e107_core/templates/login_template.php
@@ -83,7 +83,7 @@ if(!isset($LOGIN_TABLE_FOOTER))
 
 // Starter for v2. - Bootstrap 
 $LOGIN_TEMPLATE['page']['header'] = "
-	<div>
+	<div id='login-template'>
 		<div class='center' style='padding:50px; margin-left:auto; margin-right: auto'>
 			{LOGO=login}
 		</div>";
diff --git a/e107_handlers/redirection_class.php b/e107_handlers/redirection_class.php
index a00588e1f..e4fd545c1 100644
--- a/e107_handlers/redirection_class.php
+++ b/e107_handlers/redirection_class.php
@@ -50,8 +50,8 @@ class redirection
 	 */
 	function __construct()
 	{
-		$this->self_exceptions = array(SITEURL.e_SIGNUP, SITEURL, SITEURL.'index.php', SITEURL.'fpw.php', SITEURL.e_LOGIN, SITEURL.'membersonly.php');
-		$this->page_exceptions = array('e_ajax.php', 'e_js.php', 'e_jslib.php', 'sitedown.php');
+		$this->self_exceptions = array(e_SIGNUP, SITEURL, SITEURL.'index.php', SITEURL.'fpw.php', e_LOGIN, SITEURL.'membersonly.php');
+		$this->page_exceptions = array('e_ajax.php', 'e_js.php', 'e_jslib.php', 'sitedown.php',e_LOGIN);
 		$this->query_exceptions = array('logout');
 	}
 	
@@ -262,6 +262,13 @@ class redirection
 			}
 		}
 		
+		/*
+		echo "e_SELF=".e_SELF;
+		echo "<br />e_PAGE=".e_PAGE;
+		print_a( $this->self_exceptions);
+		print_a($this->page_exceptions);
+		*/
+		
 		$this->saveMembersOnlyUrl();
 		$this->redirect(e_HTTP.'membersonly.php');
 	}
diff --git a/e107_themes/bootstrap3/style.css b/e107_themes/bootstrap3/style.css
index 2926d92e8..48a5f24a7 100644
--- a/e107_themes/bootstrap3/style.css
+++ b/e107_themes/bootstrap3/style.css
@@ -2,4 +2,43 @@
 body {
   padding-top: 50px;
   padding-bottom: 20px;
+}
+
+
+/* Sign in Page */
+
+
+.form-signin {
+  max-width: 330px;
+  padding: 15px;
+  margin: 0 auto;
+}
+.form-signin .form-signin-heading,
+.form-signin .checkbox {
+  margin-bottom: 10px;
+}
+.form-signin .checkbox {
+  font-weight: normal;
+}
+.form-signin .form-control {
+  position: relative;
+  font-size: 16px;
+  height: auto;
+  padding: 10px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+.form-signin .form-control:focus {
+  z-index: 2;
+}
+.form-signin input[type="text"] {
+  margin-bottom: -1px;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.form-signin input[type="password"] {
+  margin-bottom: 10px;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
 }
\ No newline at end of file