diff --git a/extensions/mssql/src/errorDiagnostics/errorDiagnosticsConstants.ts b/extensions/mssql/src/errorDiagnostics/errorDiagnosticsConstants.ts
index fd1a6bad9b..4e76af9c6d 100644
--- a/extensions/mssql/src/errorDiagnostics/errorDiagnosticsConstants.ts
+++ b/extensions/mssql/src/errorDiagnostics/errorDiagnosticsConstants.ts
@@ -7,7 +7,8 @@ import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
 // Error code reference comes from here: https://learn.microsoft.com/en-us/sql/relational-databases/errors-events/database-engine-events-and-errors?view=sql-server-ver16
-export const MssqlPasswordResetErrorCode: number = 18488;
+export const MssqlPasswordResetErrorCode: number[] = [18488, 18487];
+
 export const MssqlCertValidationFailedErrorCode: number = -2146893019;
 
 export const MssqlConnectionTelemetryView = 'MssqlConnectionErrorDialog';
diff --git a/extensions/mssql/src/errorDiagnostics/errorDiagnosticsProvider.ts b/extensions/mssql/src/errorDiagnostics/errorDiagnosticsProvider.ts
index 18bb545bf3..83f59243bc 100644
--- a/extensions/mssql/src/errorDiagnostics/errorDiagnosticsProvider.ts
+++ b/extensions/mssql/src/errorDiagnostics/errorDiagnosticsProvider.ts
@@ -54,7 +54,7 @@ export class ErrorDiagnosticsProvider extends SqlOpsFeature<any> {
 				let handleConnectionError = async (errorInfo: azdata.diagnostics.IErrorInformation, connection: azdata.connection.ConnectionProfile): Promise<azdata.diagnostics.ConnectionDiagnosticsResult> => {
 					let restoredProfile = this.convertToIConnectionProfile(connection);
 
-					if (errorInfo.errorCode === ErrorDiagnosticsConstants.MssqlPasswordResetErrorCode) {
+					if (ErrorDiagnosticsConstants.MssqlPasswordResetErrorCode.includes(errorInfo.errorCode)) {
 						logDebug(`ErrorDiagnosticsProvider: Error Code ${errorInfo.errorCode} requires user to change their password, launching change password dialog.`);
 						return await this.handleChangePassword(restoredProfile);
 					}