Fix host form creation