TASK-40: Sync Client manager and list view properly

oh doh... also, you're so quick!