finished API-based user management changes