--- /Volumes/data/Arthur projecten/TWiki/TWiki 4/twikiplugins/PatternSkin/templates/login.pattern.tmpl  2006-12-06 11:29:56.000000000 +0100
+++ /Volumes/data/Arthur projecten/TWiki/TWiki 4/twikiplugins/PatternSkin/templates/login.pattern.tmpl.new      2006-12-06 11:31:42.000000000 +0100
@@ -67,6 +67,30 @@
 
 
 
+%TMPL:DEF{"usernamestep"}%<div class="twikiFormStep">
+---+++ %MAKETEXT{"Username"}%
+
+<input class="twikiInputField" type="text" size="30" name="username" value="%URLPARAM{"username"}%" tabindex="1" />
+%TMPL:P{"authenticationnote"}%
+</div><!-- /twikiFormStep-->%TMPL:END%
+
+
+
+%TMPL:DEF{"rememberbox"}%<input id="remember" name="remember" type="checkbox" value="1" tabindex="3" />&nbsp;<label for="remember">%MAKETEXT{"Remember me"}%</label>%TMPL:END%
+
+
+
+%TMPL:DEF{"passwordstep"}%<div class="twikiFormStep">
+---+++ %MAKETEXT{"Password"}%
+
+<input class="patternFormFieldVerticalForm" type="password" size="30" class="twikiInputField" name="password" value="" tabindex="2" />%TMPL:P{"forgotpasswordnote"}%
+
+%{ TMPL:P{"rememberbox" }%
+</div><!-- /twikiFormStep-->%TMPL:END%
+
+
+
+
 %TMPL:DEF{"forgotpasswordnote"}%&nbsp;<span class="twikiSmallish">[[%TWIKIWEB%.ResetPassword][%MAKETEXT{"I forgot my password"}%]]</span>%TMPL:END%
 
 
@@ -84,17 +108,8 @@
 <div class="twikiFormStep">
 %TMPL:P{"pagetitle"}%%TMPL:P{"pagenote"}%
 </div><!-- /twikiFormStep-->
-<div class="twikiFormStep">
----+++ %MAKETEXT{"Username"}%
-
-%ICON{"person"}% <input class="twikiInputField" type="text" size="30" name="username" value="%URLPARAM{"username"}%" tabindex="1" />
-%TMPL:P{"authenticationnote"}%
-</div><!-- /twikiFormStep-->
-<div class="twikiFormStep">
----+++ %MAKETEXT{"Password"}%
-
-%ICON{"key"}% <input class="patternFormFieldVerticalForm" type="password" size="30" class="twikiInputField" name="password" value="" tabindex="2" />%TMPL:P{"forgotpasswordnote"}%
-</div><!-- /twikiFormStep-->
+%TMPL:P{"usernamestep"}%
+%TMPL:P{"passwordstep"}%
 <div class="twikiFormStep twikiLast">
 <input class="twikiSubmit" type="submit" value='%MAKETEXT{"Logon"}%' tabindex="3" />
 </div><!-- /twikiFormStep-->