This patch fixes an issue to use basic auth when the datasource is adding for the first time. It also adds a delay when service is started.