Make the client management system more sane.