fixed client create and edit