Fix addition of gateways in initial configuration wizard