UserManagement: some minor changes