Fix form data retreival for setup