1. Fix for user managements