diff --git a/extensions/mssql/src/sqlClusterLookUp.ts b/extensions/mssql/src/sqlClusterLookUp.ts
index d8223bce3b..d67379fd53 100644
--- a/extensions/mssql/src/sqlClusterLookUp.ts
+++ b/extensions/mssql/src/sqlClusterLookUp.ts
@@ -122,8 +122,8 @@ async function createSqlClusterConnInfo(sqlConnInfo: azdata.IConnectionProfile |
 		try {
 			clusterController = await getClusterController(controllerEndpoint.endpoint, clusterConnInfo);
 			// We've successfully connected so now store the username/password for future connections
-			appContext.extensionContext.globalState.update(usernameKey, clusterConnInfo.options[constants.userPropName]);
-			credentialProvider.saveCredential(connectionId, clusterConnInfo.options[constants.passwordPropName]);
+			await appContext.extensionContext.globalState.update(usernameKey, clusterConnInfo.options[constants.userPropName]);
+			await credentialProvider.saveCredential(connectionId, clusterConnInfo.options[constants.passwordPropName]);
 			clusterConnInfo.options[constants.userPropName] = await clusterController.getKnoxUsername(clusterConnInfo.options[constants.userPropName]);
 		} catch (err) {
 			console.log(`Unexpected error getting Knox username for SQL Cluster connection: ${err}`);
@@ -149,7 +149,7 @@ async function createSqlClusterConnInfo(sqlConnInfo: azdata.IConnectionProfile |
 
 async function getClusterController(controllerEndpoint: string, connInfo: ConnectionParam): Promise<bdc.IClusterController | undefined> {
 	const bdcApi = <bdc.IExtension>await vscode.extensions.getExtension(bdc.constants.extensionName).activate();
-	let authType: bdc.AuthType = connInfo.options[constants.authenticationTypePropName].toLowerCase() === AuthType.Integrated ? 'integrated' : 'basic';
+	const authType: bdc.AuthType = connInfo.options[constants.authenticationTypePropName].toLowerCase() === AuthType.Integrated ? 'integrated' : 'basic';
 	const controller = bdcApi.getClusterController(
 		controllerEndpoint,
 		authType,
@@ -163,8 +163,8 @@ async function getClusterController(controllerEndpoint: string, connInfo: Connec
 		// cancels out or we successfully connect
 		console.log(`Error connecting to cluster controller: ${err}`);
 		let errorMessage = '';
+		const prompter = new CodeAdapter();
 		while (true) {
-			const prompter = new CodeAdapter();
 			let username = await prompter.promptSingle<string>(<IQuestion>{
 				type: QuestionTypes.input,
 				name: 'inputPrompt',