Plan limits were partially incorrect

The calculation of current limits for a user account was partially incorrect. This has been fixed now and the plan limits should work as intended.