           if err
             callback err
           else
-            messageOptions.requestedAt = certificate.getAt('requestedAt')
-
-            messageOptions.resetPassword = no
+            messageOptions =
+              url           : "#{protocol}//#{host}/#{verb}/#{encodeURIComponent token}"
+              resetPassword : options.resetPassword
+              requestedAt   : certificate.getAt('requestedAt')
+
             JMail = require './email'
             email = new JMail
               from            : @getPasswordRecoveryEmail()

    JMail.one redemptionToken: @token, (err, mail) =>
      return callback err  if err

      dateThen = 
        if mail.dateDelivered
        then mail.dateDelivered
        else

      @one {token}, (err, certificate)->
        return callback err  if err
        return callback { message: 'Invalid token.' }  unless certificate
        {status, expiresAt} = certificate
        if (status isnt 'active') or (expiresAt? and expiresAt < new Date)
          console.warn 'Old-style password reset token is expired', delegate.profile.nickname
          return callback message: """
