TASK-40: Sync Client manager and list view properly

yeah overloads!