Fix initial user setup management