diff --git a/src/sql/platform/accounts/common/accountActions.ts b/src/sql/platform/accounts/common/accountActions.ts
index 18f4103225..ce6523fec1 100644
--- a/src/sql/platform/accounts/common/accountActions.ts
+++ b/src/sql/platform/accounts/common/accountActions.ts
@@ -123,7 +123,7 @@ export class ApplyFilterAction extends Action {
  */
 export class RefreshAccountAction extends Action {
 	public static ID = 'account.refresh';
-	public static LABEL = localize('refreshAccount', "Reenter your credentials");
+	public static LABEL = localize('refreshAccount', "Refresh your credentials");
 	public account?: azdata.Account;
 
 	constructor(
diff --git a/src/sql/workbench/services/accountManagement/browser/accountPickerImpl.ts b/src/sql/workbench/services/accountManagement/browser/accountPickerImpl.ts
index a9f730584d..3a47a7e369 100644
--- a/src/sql/workbench/services/accountManagement/browser/accountPickerImpl.ts
+++ b/src/sql/workbench/services/accountManagement/browser/accountPickerImpl.ts
@@ -256,9 +256,12 @@ export class AccountPicker extends Disposable {
 
 	private onAccountSelectionChange(account: azdata.Account | undefined) {
 		this.viewModel.selectedAccount = account;
-		if (account && account.isStale) {
+		if (!account) {
+			DOM.hide(this._tenantContainer!);
+		} else if (account && account.isStale) {
 			this._refreshAccountAction!.account = account;
 			DOM.show(this._refreshContainer!);
+			DOM.hide(this._tenantContainer!);
 		} else if (account) {
 			DOM.hide(this._refreshContainer!);