Added the necessary logic to edit clients, this fixes #3