computeExpiry more robust. New users have correct expiry date.