Code refactored in User Management part.