Improved User Management - Small additional improvement