TASK-40: Sync Client manager and list view properly

again, autogenerated code. I agreed completely