Count non expiring tokens when determining if the limit is reached

Fixes #280

Thanks to @pablomm for the code in the ticket