diff --git a/db/migrations/V12_3__auth_token.sql b/db/migrations/V12_3__auth_token.sql
index 0ae0625ebd7c78d34fa5386adb39413bcdd59924..d04019e6d18dbc980231536ffb503569b49b13fc 100644
--- a/db/migrations/V12_3__auth_token.sql
+++ b/db/migrations/V12_3__auth_token.sql
@@ -4,7 +4,7 @@ CREATE TABLE `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`)
@@ -64,14 +64,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//