Index: login.vm
===================================================================
--- login.vm	(revision 33894)
+++ login.vm	(working copy)
@@ -18,7 +18,7 @@
 #template("startpage.vm")
 <div class="main layoutsubsection">
 <div id="mainContentArea">
-<form id="loginForm" action="$doc.getURL('loginsubmit')" method="post">
+<form id="loginForm" action="$doc.getURL('loginsubmit')" method="post" class="xform">
 <div class="hidden"><input type="hidden" name="xredirect" value="$!{escapetool.xml($request.xredirect)}"/>
 #if("$!request.srid" != '')
   <input type="hidden" name="srid" value="$!escapetool.xml($request.srid)"/>
@@ -30,27 +30,27 @@
   <!-- previous login errors -->
   #error($message)
 #end
-<table class="xwikilogintable" summary="$msg.get('loginform')">
-  <tr>
-    <th><label for="j_username">$msg.get('username'):</label></th>
-    <td><input type="text" id="j_username" name="j_username" value=""/></td>
-  </tr>
-  <tr>
-    <th><label for="j_password">$msg.get('password'):</label></th>
-    <td><input type="password" id="j_password" name="j_password" value=""/></td>
-  </tr>
-  <tr>
-    <td colspan="2" style="text-align: left;">
-      <input id="rememberme" type="checkbox" name="j_rememberme" value="true"/>
-      <label for="rememberme">$msg.get('remembermeonthiscomp')</label>
-    </td>
-  </tr>
-</table>
+<dl>
+  <dt>
+    <label for="j_username">$msg.get('username')</label>
+    #if($xwiki.exists('XWiki.ForgotUsername'))
+      <span class="xAdditional"><a href="$xwiki.getURL('XWiki.ForgotUsername')">$msg.get('forgotusername')</a></span>
+    #end
+  </dt>
+  <dd><input type="text" id="j_username" size="60" name="j_username" value=""/></dd>
+  <dt>
+    <label for="j_password">$msg.get('password')</label>
+    #if($xwiki.exists('XWiki.ResetPassword'))
+      <span class="xAdditional"><a href="$xwiki.getURL('XWiki.ResetPassword')">$msg.get('forgotpassword')</a></span>
+    #end
+  </dt>
+  <dd><input type="password" id="j_password" size="60" name="j_password" value=""/></dd>
+  <dd class="xHint buttons">
+    <input id="rememberme" type="checkbox" name="j_rememberme" value="true"/>
+    <label for="rememberme">$msg.get('remembermeonthiscomp')</label>
+  </dd>
+</dl>
 <div class="buttons"><span class="buttonwrapper"><input type="submit" class="button" value="$msg.get('login')"/></span></div>
-## TODO: Replace this with an interface extension once IX are implemented
-#if($xwiki.exists('XWiki.ResetPassword'))
-  <div style="font-size: 70%; margin-top: 2em;">Forgot your <a href="$xwiki.getURL('XWiki.ForgotUsername')">username</a> or <a href="$xwiki.getURL('XWiki.ResetPassword')">password</a>?</div>
-#end
 #xwikimessageboxend()
 </form>
 </div>## mainContentArea