log-date and log-since tokens incorrect

I was using these tokens, and found that it had been 40 years and 22 weeks since I had logged in. "Odd," I thought, and so looked at the code. Turns out there were two problems (I believe). The first being that the computations for the tokens were using the access attribute of the $account object, and the second being that the 'log-since' token was not computing an interval. I believe the two lines should read...

      $values['log-date']       = $account->uid ? format_date($account->login, 'short') : '';
      $values['log-since']      = $account->uid ? format_interval(time() - $account->login) : '';

Shawn