fixed forms according to improved installation wizard