diff --git a/model/AdminHandler.php b/model/AdminHandler.php
index bce422fa..2897f5ff 100644
--- a/model/AdminHandler.php
+++ b/model/AdminHandler.php
@@ -79,7 +79,7 @@ class AdminHandler extends PFAHandler {
             'phone'           => pacol( 1,  $passwordReset, 0,      'text', 'pCreate_mailbox_phone', 'pCreate_mailbox_phone_desc', ''),
             'email_other'     => pacol( 1,  $passwordReset, 0,      'mail', 'pCreate_mailbox_email', 'pCreate_mailbox_email_desc', ''),
             'token'           => pacol( 1,          0,      0,      'text', ''                   , ''                  ),
-            'token_validity'  => pacol( 1,          0,      0,      'ts',   ''                   , ''                  ),
+            'token_validity'  => pacol( 1,          0,      0,      'ts',   ''                   , '', date("Y-m-d H:i:s",time())),
             'created'         => pacol( 0,          0,      0,      'ts',   'created'            , ''                  ),
             'modified'        => pacol( 0,          0,      1,      'ts',   'last_modified'      , ''                  ),
         );
diff --git a/model/MailboxHandler.php b/model/MailboxHandler.php
index 0e0fbccb..4bd7a8f6 100644
--- a/model/MailboxHandler.php
+++ b/model/MailboxHandler.php
@@ -42,7 +42,7 @@ class MailboxHandler extends PFAHandler {
             'phone'         => pacol(   1,  $passwordReset, 0,      'text', 'pCreate_mailbox_phone'         , 'pCreate_mailbox_phone_desc'       , ''),
             'email_other'   => pacol(   1,  $passwordReset, 0,      'mail', 'pCreate_mailbox_email'         , 'pCreate_mailbox_email_desc'       , ''),
             'token'         => pacol(   1,          0,      0,      'text', ''                              , ''                                 ),
-            'token_validity'=> pacol(   1,          0,      0,      'ts',   ''                              , ''                                 ),
+            'token_validity'=> pacol(   1,          0,      0,      'ts',   ''                              , '', date("Y-m-d H:i:s",time())),
             'created'       => pacol(   0,          0,      1,      'ts',   'created'                       , ''                                 ),
             'modified'      => pacol(   0,          0,      1,      'ts',   'last_modified'                 , ''                                 ),
             # TODO: add virtual 'notified' column and allow to display who received a vacation response?