Fix welcome message issue that breaks installation

Also move the root shell config to the user-setup script