More Client Form Changes