Fixed user management issue