Users Plugin: Improvements