First setup fix

First setup form bugs #671