diff --git a/C4/Auth.pm b/C4/Auth.pm
index 06401fe976..cc1a5ac0da 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -638,7 +638,6 @@ sub checkauth {
         push @inputs, { name => $name, value => $value };
     }
     # get the branchloop, which we need for authetication
-	use C4::Branch;
     my $branches = GetBranches();
     my @branch_loop;
     for my $branch_hash (keys %$branches) {
@@ -648,6 +647,7 @@ sub checkauth {
     my $template = gettemplate( $template_name, $type, $query );
     $template->param(branchloop => \@branch_loop,);
     $template->param(
+		login				 => 1,
         INPUTS               => \@inputs,
         suggestion           => C4::Context->preference("suggestion"),
         virtualshelves       => C4::Context->preference("virtualshelves"),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
index bb566f9bd4..73f2288614 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
@@ -14,15 +14,15 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="timed_out" -->
-<div id="login_error"><strong>Login Error</strong>: session timed out, please log in again</div>
+<div id="login_error"><strong>Error</strong>: session timed out, please log in again</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="different_ip" -->
-<div id="login_error"><strong>Login Error</strong>IP address has changed, please log in again </div>
+<div id="login_error"><strong>Error</strong>: IP address has changed, please log in again </div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="invalid_username_or_password" -->
-<div id="login_error"><strong>Login Error</strong>Incorrect username or password</div>
+<div id="login_error"><strong>Error</strong>: Incorrect username or password</div>
 <!-- /TMPL_IF -->
 
 <!-- login prompt time-->
@@ -36,22 +36,20 @@
 <p><label>Password:<br />
 <input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" /></label>
 </p>
-<p>
-<label for="branch">Library:</label>
+<p><label for="branch">Library:<br />
 <select name="branch" id="branch" class="input">
 <!-- TMPL_LOOP NAME="branchloop" -->
 <option value="<!-- TMPL_VAR NAME='branchcode' -->"><!-- TMPL_VAR NAME='branchname' --></option>
 <!-- /TMPL_LOOP -->
-</select>
-</p>
-<p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label>
+</select></label>
 </p>
+<!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
 
 <p class="submit"><input id="submit" type="submit" value="Login &raquo;" tabindex="4" /></p>
 </form>
-<ul>
-	<li><a href="/cgi-bin/koha/lostpassword.pl" title="Password Lost and Found">Lost your password?</a></li>
-</ul>
+<!--<ul> -->
+<!--	<li><a href="/cgi-bin/koha/lostpassword.pl" title="Password Lost and Found">Lost your password?</a></li> -->
+<!-- </ul> -->
 <!-- /TMPL_IF -->
 
 <script type="text/javascript">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/fade-butt.png b/koha-tmpl/intranet-tmpl/prog/en/images/fade-butt.png
new file mode 100644
index 0000000000..42f08b7994
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/en/images/fade-butt.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/koha-logo.gif b/koha-tmpl/intranet-tmpl/prog/en/images/koha-logo.gif
new file mode 100644
index 0000000000..247f30007d
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/en/images/koha-logo.gif differ
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index f959558e27..bbf580977c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -2,8 +2,11 @@
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/intranet-print.css" />
 <style type="text/css" media="screen"> 
-  <!--TMPL_IF NAME="popup"-->
+  <!-- TMPL_IF NAME="popup" -->
     @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet2popup.css);
+  <!-- /TMPL_IF -->
+  <!-- TMPL_IF NAME="login" -->
+	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/login.css);
   <!-- TMPL_ELSE -->
 	  <!-- TMPL_IF NAME="intranetstylesheet" -->
 	    @import url(<!-- TMPL_VAR NAME="intranetstylesheet" -->);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/login.css b/koha-tmpl/intranet-tmpl/prog/en/includes/login.css
new file mode 100644
index 0000000000..b98f13f138
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/login.css
@@ -0,0 +1,139 @@
+a.edit, a.delete, a.edit:hover, a.delete:hover {
+	border-bottom: none;
+	display: block;
+	padding: 5px 0;
+	text-align: center;
+}
+
+a.edit:hover {
+	background: #ccc;
+	color: #036;
+}
+
+a:visited {
+	color: #006;
+}
+
+a:hover {
+/*	border-bottom: 1px solid #3a75ae;*/
+	color: #069;
+}
+
+body	{
+	background: #f9fcfe;
+	color: #000;
+	margin: 0;
+	padding: 0;
+}
+
+body, td {
+	font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
+}
+
+form, label input {
+	margin: 0;
+	padding: 0;
+}
+
+input:focus, textarea:focus, label:focus {
+	background: #fff;
+	border: 1px solid #686868;
+}
+
+label {
+	cursor: pointer;
+}
+
+#logo { margin-bottom: 2em; }
+
+#login {
+	background: #fff;
+	border: 1px solid #a2a2a2;
+	margin: 5em auto;
+	padding: 1.5em;
+	width: 25em;
+}
+
+#login #login_error {
+	background: #c00;
+	border: 1px solid #a40000;
+	color: #fff;
+	font-size: 16px;
+	font-weight: bold;
+	padding: .5em;
+	text-align: center;
+}
+
+#login h1 {
+	background: url(/intranet-tmpl/prog/en/images/koha-logo.gif) no-repeat top left;
+	margin-top: 0;
+}
+
+#login h1 a {
+	display: block;
+	text-indent: -1000px;
+	height: 66px;
+	border-bottom: none;
+}
+
+#login input {
+	padding: 3px;
+}
+
+#login ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+#login ul li {
+	display: inline;
+	margin-left: 1.4em;
+	text-align: center;
+}
+
+#login #userid, #password {
+	font-size: 1.7em;
+	width: 80%;
+}
+
+#login #submit {
+	font-size: 1.7em;
+}
+
+
+#footer {
+        text-align: center;
+        border-top: 1px solid #ccc;
+        padding-top: 1em;
+        font-style: italic;
+}
+
+.submit input, .submit input:focus, .button {
+	background: url(/intranet-tmpl/prog/en/images/fade-butt.png );
+	border: 3px double #999;
+	border-left-color: #ccc;
+	border-top-color: #ccc;
+	color: #333;
+	padding: 0.25em;
+}
+
+.submit input:active, .button:active {
+	background: #f4f4f4;
+	border: 3px double #ccc;
+	border-left-color: #999;
+	border-top-color: #999;
+}
+
+.submit, .editform th, #postcustomsubmit {
+	text-align: right;
+}
+
+textarea, input, select {
+	background: #f4f4f4;
+	border: 1px solid #b2b2b2;
+	color: #000;
+	font:  13px Verdana, Arial, Helvetica, sans-serif;
+	margin: 1px;
+	padding: 3px;
+}