Fixed client validations and forms