updated form setting handling