Improve consistency for unlimited users (#1)