diff --git a/db/stored/functions.sql b/db/stored/functions.sql
index d638079e5101aaf6f3bbbf0c08c5d51f6886029c..f09984cff5e3a745cbbd024a6b62c329cdbd40cb 100644
--- a/db/stored/functions.sql
+++ b/db/stored/functions.sql
@@ -2309,14 +2309,14 @@ BEGIN
     DECLARE vSeed int(11) DEFAULT FLOOR(4294967296 * RAND(CURRENT_TIMESTAMP ^ LAST_INSERT_ID() ^ (pAccountID << 10)));
     DECLARE vToken char(40) charset ascii DEFAULT SHA1(vSeed);
 
-    WHILE NOT vCreated AND vCounter > 0 DO
+    WHILE NOT vCreated AND vCounter > 0 DO BEGIN
         DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET vCreated = FALSE;
         SET vToken = SHA1(RAND());
         INSERT INTO auth_tokens(Token, AccountID, Mask) VALUES (vToken, pAccountID, pRightMask);
 
         SET vCreated = TRUE;
         SET vCounter = vCounter - 1;
-    END WHILE;
+    END; END WHILE;
 
     RETURN IF(vCreated, vToken, '');
 END//
diff --git a/db/structure/base.sql b/db/structure/base.sql
index 45e998558f402999d7e09eb6af2eaaeb65426d9c..ad2c4a47a72b82425c369e00680d0fe3b62f5134 100644
--- a/db/structure/base.sql
+++ b/db/structure/base.sql
@@ -480,7 +480,7 @@ CREATE TABLE IF NOT EXISTS `auth_tokens` (
   `Token` char(40) charset ascii NOT NULL,
   `AccountID` int(11) NOT NULL,
   `Created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `Accessed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `Accessed` TIMESTAMP NOT NULL DEFAULT 0,
   `Mask` int(11) NOT NULL DEFAULT 0,
   UNIQUE KEY `Token` (`Token`),
   KEY `AccountID` (`AccountID`)