diff --git a/src/sql/workbench/services/connection/browser/connectionDialogService.ts b/src/sql/workbench/services/connection/browser/connectionDialogService.ts
index 2e7b73086a..15d3711e3f 100644
--- a/src/sql/workbench/services/connection/browser/connectionDialogService.ts
+++ b/src/sql/workbench/services/connection/browser/connectionDialogService.ts
@@ -423,6 +423,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
 		this._params = params;
 		this._inputModel = model;
 		return new Promise<void>((resolve, reject) => {
+			this.updateModelServerCapabilities(model);
 			// If connecting from a query editor set "save connection" to false
 			if (params && (params.input && params.connectionType === ConnectionType.editor ||
 				params.connectionType === ConnectionType.temporary)) {
@@ -454,6 +455,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
 			this._connectionDialog.render();
 		}
 		this._connectionDialog.newConnectionParams = params;
+		this._connectionDialog.updateProvider(this._providerNameToDisplayNameMap[this._currentProviderType]);
 
 		const recentConnections: ConnectionProfile[] = this._connectionManagementService.getRecentConnections(params.providers);
 		await this._connectionDialog.open(recentConnections.length > 0);
diff --git a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts
index cb72c40ff9..ae8acd83a5 100644
--- a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts
+++ b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts
@@ -277,6 +277,7 @@ export class ConnectionDialogWidget extends Modal {
 		// Show connection form based on server type
 		DOM.clearNode(this._connectionUIContainer);
 		this._onShowUiComponent.fire({ selectedProviderDisplayName: selectedProviderDisplayName, container: this._connectionUIContainer });
+		this.initDialog();
 	}
 
 	private connect(element?: IConnectionProfile): void {