diff --git a/koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl
index 2244507c3c..2840f4c978 100644
--- a/koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl
@@ -2,7 +2,21 @@
 <TMPL_IF NAME="nopermission">
 <!-- This is what is displayed if user doesnt have permission -->
 <h2>Sorry, KOHA doesnt think you have permission for this page.<h2>
+</TMPL_IF>
 
+<TMPL_IF NAME="timed_out">
+<!-- This is what is displayed if login has timed out -->
+<h2>Sorry, your session has timed out, please login again.<h2>
+</TMPL_IF>
+
+<TMPL_IF NAME="different_ip">
+<!-- This is what is displayed if user doesnt have permission -->
+<h2>You are accessing koha from a different ip address! please login again.<h2>
+</TMPL_IF>
+
+<TMPL_IF NAME="invalid_username_or_password">
+<!-- This is what is displayed if user doesnt have permission -->
+<h2>You entered an incorrect username or password, please try again.<h2>
 </TMPL_IF>
 
 
@@ -10,7 +24,6 @@
 <!-- login prompt time-->
 
 <center>
-<h2><TMPL_VAR NAME="message"></h2>
 
 <form action='<TMPL_VAR NAME="url">' method="post">
 <TMPL_LOOP NAME="INPUTS">
@@ -22,7 +35,7 @@
     <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">
     <tr><th colspan="2" background="/images/background-mem.gif"><font size="+2">Koha Login</font></th></tr>
     <tr><td>Cardnumber:</td><td><input name="userid"></td></tr>
-    <tr><td>Password:</td><td><input type=password name=password></td></tr>
+    <tr><td>Password:</td><td><input type="password" name="password"></td></tr>
     <tr><td colspan="2" align="center"><input type="submit" value="login"></td></tr>
     </table>
     </td><td align="center" valign="top">