CLOUDIFY-1395 Improving the user expereince during initial setup