diff --git a/bureau/admin/index.php b/bureau/admin/index.php
index 07dcda37..a575116c 100644
--- a/bureau/admin/index.php
+++ b/bureau/admin/index.php
@@ -82,7 +82,7 @@ if (!$_SERVER[HTTPS]) {
 <tr><th align="right"><label for="password"><?php echo _("Password"); ?></label></th><td><input type="password" class="int" name="password" id="password" value="" maxlength="128" size="15" /></td></tr>
 <tr><td colspan="2" align="center"><input type="submit" class="inb" name="submit" value="<?php __("Enter"); ?>" /><input type="hidden" id="restrictip" name="restrictip" value="1" /></td></tr>
 </table>
-<input type="hidden" id="authip_token" name="authip_token" value="<?php echo htmlentities($authip_token) ?>" />
+<input type="hidden" id="authip_token" name="authip_token" value="<?php echo htmlentities( (empty($authip_token)?'':$authip_token) ) ?>" />
 </form>
 
 </td></tr>
diff --git a/bureau/admin/login.php b/bureau/admin/login.php
index 82e5ca72..edd827ad 100644
--- a/bureau/admin/login.php
+++ b/bureau/admin/login.php
@@ -38,6 +38,8 @@ if (!$mem->checkid())
 	exit();
 }
 
+$mem->resetlast();
+
 include("main.php");
 exit;
 
diff --git a/bureau/admin/main.php b/bureau/admin/main.php
index f01130cc..92e0bd98 100644
--- a/bureau/admin/main.php
+++ b/bureau/admin/main.php
@@ -45,7 +45,6 @@ if ($mem->user["lastfail"]) {
 	printf(_("%1\$d login failed since last login")."<br />",$mem->user["lastfail"]);
 }
 
-$mem->resetlast();
 
 /*
  use MagpieRSS to syndicate content from another site if available