diff --git a/koha-tmpl/opac-tmpl/hlt/en/includes/membership-left-nav.inc b/koha-tmpl/opac-tmpl/hlt/en/includes/membership-left-nav.inc
index 70be983360..2be2b32a3b 100644
--- a/koha-tmpl/opac-tmpl/hlt/en/includes/membership-left-nav.inc
+++ b/koha-tmpl/opac-tmpl/hlt/en/includes/membership-left-nav.inc
@@ -1,11 +1,17 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
 <tr valign="top"><td width="5"><img src="<TMPL_VAR NAME='themelang'>/images/styles/nav-left-left.gif" width="5" height="63" border="0" alt="" /></td>
-  <td width="133"><table border="0" cellpadding="0" cellspacing="0" width="133">
+  <td width="133">
+<table border="0" cellpadding="0" cellspacing="0" width="133">
   <tr valign="top"><td colspan="3" background=""><img src="<TMPL_VAR NAME='themelang'>/images/styles/left-top.gif" width="133" height="39" border="0" alt="" /></td></tr>
-  <tr valign="top"><td width="9"><img src="<TMPL_VAR NAME='themelang'>/images/styles/left-2ndrow.gif" width="9" height="13" border="0" alt="" /></td>
-    <td width="124" colspan="2" class="navhead"><!--+Katipo+start name="leftheading" include="/includes/membership-left-nav.inc" lastmod="12 Jun, 2002 at 18:24:46"--><a href="/membership/">Members</a><!--+Katipo+end--></td></tr>
+<tr valign="top">
+<td width="9"><img src="<TMPL_VAR NAME='themelang'>/images/styles/left-2ndrow.gif" width="9" height="13" border="0" alt="" /></td>
+<td width="124" colspan="2" class="navhead"><!--+Katipo+start name="leftheading" include="/includes/membership-left-nav.inc" lastmod="12 Jun, 2002 at 18:24:46"-->
+<a href="/membership/">Members</a><!--+Katipo+end--></td></tr>
 <!--+Katipo+start name="leftnav" include="/includes/membership-left-nav.inc"-->
 
+
+<TMPL_IF NAME="loggedinuser">
+
  
   <tr><td colspan="3"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="1" height="5" border="0" alt="" /></td></tr>
 <tr><td colspan="3"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="1" height="5" border="0" alt="" /></td></tr>
@@ -17,7 +23,61 @@
 <tr><td colspan="3"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="1" height="5" border="0" alt="" /></td></tr>
   <tr valign="top"><td></td><td><img src="<TMPL_VAR NAME='themelang'>/images/styles/nav-dot.gif" width="9" height="13" border="0" alt="" /></td>
     <td width="115" class="sidenav"><a href="/cgi-bin/koha/opac-userdetails.pl">Personal Details</a></td></tr>
+
+ <tr valign="top"><td colspan=3><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="1" height="15" border="0" alt="" /></td>
+   </tr>
+<TMPL_LOOP NAME="USER_INFO">
+<tr valign="top"><td></td><td><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="9" height="13" border="0" alt="" /></td><td class="small">
+   <B> <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></B>
+</td></tr>
+<TMPL_IF NAME="emailaddress">
+<tr valign="top"><td><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="9" height="13" border="0" alt="" /></td><td class="small"></td><td class="sidenav">
+    <A HREF='mailto:<TMPL_VAR NAME="emailaddress">'><TMPL_VAR NAME="emailaddress"></A>
+</td></tr>
+</TMPL_IF>
+<TMPL_IF NAME="streetaddress">
+<tr valign="top"><td><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="9" height="13" border="0" alt="" /></td><td class="small"></td><td class="sidenav">
+    <TMPL_VAR NAME="streetaddress">
+</td></tr>
+</TMPL_IF>
+<TMPL_IF NAME="suburb">
+<tr valign="top"><td><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="9" height="13" border="0" alt="" /></td><td class="small"></td><td class="sidenav">
+    <TMPL_VAR NAME="suburb">
+</td></tr>
+</TMPL_IF>
+<TMPL_IF NAME="city">
+<tr valign="top"><td><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="9" height="13" border="0" alt="" /></td><td class="small"></td><td class="sidenav">
+    <TMPL_VAR NAME="city">
+</td></tr>
+</TMPL_IF>
+<TMPL_IF NAME="phone">
+<tr valign="top"><td><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="9" height="13" border="0" alt="" /></td><td class="small"></td><td class="sidenav">
+    <TMPL_VAR NAME="phone">
+</td></tr>
+</TMPL_IF>
+</TMPL_LOOP>
+<tr valign="top"><td><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="9" height="13" border="0" alt="" /></td><td class="small"></td><td class="small">
+ >><A HREF="/cgi-bin/koha/opac-userupdate.pl" class="sidenav">Edit Details</A>
+</td></tr>
+<tr><td colspan="3">
+<form action="/cgi-bin/koha/opac-main.pl" method="post">
+  <input type="image" name="logout" src="<TMPL_VAR NAME='themelang'>/images/styles/logout-button.gif" alt="Log Out" align="absmiddle" border="0" />
+</form>
+</td></tr>
+<TMPL_ELSE>
+<tr><td colspan="3">
+<form action="/cgi-bin/koha/opac-user.pl" method="post">
+  <div class="main">Members can sign in here:
+  <br />Cardnumber:
+  <br /><input type="text" name="userid" size="10" />
+  <br />Password:
+  <br /><input type="password" name="password" size="10" />&nbsp;&nbsp;
+  <input type="image" name="Go" src="<TMPL_VAR NAME='themelang'>/images/styles/home-go-button.gif" alt="Go" align="absmiddle" border="0" /></div>
+</form>
+</td></tr>
+
+</TMPL_IF>
  
 <!--+Katipo+end-->
   <tr><td colspan="3"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="1" height="10" border="0" alt="" /></td></tr>
-  </table>
\ No newline at end of file
+</table>
diff --git a/koha-tmpl/opac-tmpl/hlt/en/includes/opac-auth.inc b/koha-tmpl/opac-tmpl/hlt/en/includes/opac-auth.inc
index 0d0fb45b81..d732b513b8 100644
--- a/koha-tmpl/opac-tmpl/hlt/en/includes/opac-auth.inc
+++ b/koha-tmpl/opac-tmpl/hlt/en/includes/opac-auth.inc
@@ -53,5 +53,6 @@
   <br /><input type="password" name="password" size="18" />&nbsp;&nbsp;
   <input type="image" name="Go" src="<TMPL_VAR NAME='themelang'>/images/styles/home-go-button.gif" alt="Go" align="absmiddle" border="0" /></div>
 </form>
+</table>
 
 </TMPL_IF>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/hlt/en/opac-auth.tmpl b/koha-tmpl/opac-tmpl/hlt/en/opac-auth.tmpl
index 07a5ef4b08..a9424d9917 100644
--- a/koha-tmpl/opac-tmpl/hlt/en/opac-auth.tmpl
+++ b/koha-tmpl/opac-tmpl/hlt/en/opac-auth.tmpl
@@ -3,7 +3,7 @@
 <!--updated by richard@katipo.co.nz 12/06/02-->
 <html>
 <head>
-<title>Reading Record</title>
+<title>Login</title>
 <link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/main.css" type="text/css" />
 <script type="text/javascript" language="javascript">
 <TMPL_INCLUDE name="script.js">
@@ -32,22 +32,22 @@
 
 <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>
+<p>Sorry, KOHA doesnt think you have permission for this page.</p>
 </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>
+<p>Sorry, your session has timed out, please login again.</p>
 </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>
+<p>You are accessing koha from a different ip address! please login again.</p>
 </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>
+<p>You entered an incorrect username or password, please try again.</p>
 </TMPL_IF>
 
 
@@ -60,24 +60,23 @@
 <TMPL_LOOP NAME="INPUTS">
   <input type="hidden" name='<TMPL_VAR NAME="name">' value='<TMPL_VAR NAME="value">'>
 </TMPL_LOOP>
-<table border="0" cellpadding="10" cellspacing="0" width="60%">
-    <tr><td align="center" valign="top">
-
-    <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">
-    <tr><th colspan="2" background="<TMPL_VAR NAME='themelang'>/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 colspan="2" align="center"><input type="submit" value="login"></td></tr>
-    </table>
-    </td><td align="center" valign="top">
+<TABLE cellpadding=0 cellspacing=5 border=0>
+<TR VALIGN=TOP>
+<TD>Your card number</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="card-number"></TD></TR>
+<TR VALIGN=TOP>
+<TD>Password</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="password"></TD>
+</tr><tr>
+<td colspan=2 align="right"><input type="submit" value="OK" SIZE="2"   class="green-box"></td>
+</TR>
+</table></form>
+<p>If you don't have a password yet, next time you're in the library, take your card and some I.D. to the information counter and we'll happily issue you one.
 
 
-    </td></tr>
-</table>
-</form>
 
 </TMPL_IF>
 
+
+
 <!--+Katipo+end-->
 <!--BOTTOM NAVIGATION - ALL-->
 <TMPL_INCLUDE name="botnav-all.inc">
diff --git a/koha-tmpl/opac-tmpl/hlt/en/opac-user.tmpl b/koha-tmpl/opac-tmpl/hlt/en/opac-user.tmpl
index f19964028a..c1f5ae3268 100644
--- a/koha-tmpl/opac-tmpl/hlt/en/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/hlt/en/opac-user.tmpl
@@ -17,7 +17,6 @@
 <TMPL_INCLUDE name="top-navigation.inc">
 <!--START MAIN TABLE AND LEFT NAVIGATION-->
 <TMPL_INCLUDE name="membership-left-nav.inc">
-<TMPL_INCLUDE name="opac-auth.inc">
 <!--SEARCH FORM-->
 <TMPL_INCLUDE name="cat-search.inc">
 <!--END LEFT NAV, START CRUMBS-->