From c2339e65a5f1ef7383e232bb67750b8afe759d79 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Tue, 24 Feb 2026 19:55:23 +0000
Subject: [PATCH 01/14] implements [FEATURE] Behaviour when saving a connection
 Fixes #29

---
 Dashboard/AddServerDialog.xaml       | 18 +++++-
 Dashboard/AddServerDialog.xaml.cs    | 58 +++++++++++++++++++-
 Dashboard/Models/ServerConnection.cs |  1 +
 Lite/Windows/AddServerDialog.xaml.cs | 82 +++++++++++++++++++++++++++-
 4 files changed, 155 insertions(+), 4 deletions(-)

diff --git a/Dashboard/AddServerDialog.xaml b/Dashboard/AddServerDialog.xaml
index 24d1a05b..881475eb 100644
--- a/Dashboard/AddServerDialog.xaml
+++ b/Dashboard/AddServerDialog.xaml
@@ -26,6 +26,7 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
         <!-- Header -->
@@ -109,15 +110,28 @@
                                   IsChecked="False"
                                   Foreground="{DynamicResource ForegroundBrush}"
                                   ToolTip="When checked, accepts any server certificate without validation.&#x0a;Uncheck for stricter security (requires valid certificate)."/>
+
+                        <!-- Enable Data Collection -->
+                        <CheckBox x:Name="IsEnabledCheckBox"
+                                  Content="Enable data collection for this server"
+                                  IsChecked="True"
+                                  Foreground="{DynamicResource ForegroundBrush}"
+                                  Margin="0,10,0,0"
+                                  ToolTip="When checked, the Dashboard expects data to be collected for this server. Uncheck to save without verifying connectivity."/>
                     </StackPanel>
                 </Border>
             </StackPanel>
         </ScrollViewer>
 
+        <!-- Status -->
+        <TextBlock x:Name="StatusText" Grid.Row="2"
+                   Foreground="{DynamicResource ForegroundMutedBrush}"
+                   TextWrapping="Wrap" Margin="0,8,0,0" Visibility="Collapsed"/>
+
         <!-- Buttons -->
-        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,15,0,0">
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,15,0,0">
             <Button Content="Test Connection" Width="120" Height="30" Margin="0,0,10,0" Click="TestConnection_Click"/>
-            <Button Content="Save" Width="80" Height="30" Margin="0,0,10,0" Click="Save_Click" IsDefault="True"/>
+            <Button x:Name="SaveButton" Content="Save" Width="80" Height="30" Margin="0,0,10,0" Click="Save_Click" IsDefault="True"/>
             <Button Content="Cancel" Width="80" Height="30" Click="Cancel_Click" IsCancel="True"/>
         </StackPanel>
     </Grid>
diff --git a/Dashboard/AddServerDialog.xaml.cs b/Dashboard/AddServerDialog.xaml.cs
index f59c6f89..6c6acdf8 100644
--- a/Dashboard/AddServerDialog.xaml.cs
+++ b/Dashboard/AddServerDialog.xaml.cs
@@ -48,6 +48,7 @@ public AddServerDialog(ServerConnection existingServer)
                 _ => 0 // Optional
             };
             TrustServerCertificateCheckBox.IsChecked = existingServer.TrustServerCertificate;
+            IsEnabledCheckBox.IsChecked = existingServer.IsEnabled;
 
             if (existingServer.UseWindowsAuth)
             {
@@ -150,7 +151,7 @@ private async void TestConnection_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void Save_Click(object sender, RoutedEventArgs e)
+        private async void Save_Click(object sender, RoutedEventArgs e)
         {
             if (string.IsNullOrWhiteSpace(ServerNameTextBox.Text))
             {
@@ -177,6 +178,59 @@ private void Save_Click(object sender, RoutedEventArgs e)
                 }
             }
 
+            // Test connection when data collection is enabled
+            if (IsEnabledCheckBox.IsChecked == true)
+            {
+                SaveButton.IsEnabled = false;
+                StatusText.Text = "Testing connection...";
+                StatusText.Visibility = System.Windows.Visibility.Visible;
+
+                bool connected;
+                string? errorMessage = null;
+                try
+                {
+                    var cs = DatabaseService.BuildConnectionString(
+                        ServerNameTextBox.Text.Trim(),
+                        WindowsAuthRadio.IsChecked == true,
+                        UsernameTextBox.Text.Trim(),
+                        PasswordBox.Password,
+                        GetSelectedEncryptMode(),
+                        TrustServerCertificateCheckBox.IsChecked == true
+                    ).ConnectionString;
+
+                    var dbService = new DatabaseService(cs);
+                    connected = await dbService.TestConnectionAsync();
+                }
+                catch (Exception ex)
+                {
+                    connected = false;
+                    errorMessage = ex.Message;
+                }
+                finally
+                {
+                    SaveButton.IsEnabled = true;
+                }
+
+                if (!connected)
+                {
+                    StatusText.Text = string.Empty;
+                    StatusText.Visibility = System.Windows.Visibility.Collapsed;
+
+                    var detail = errorMessage != null ? $"\n\nError: {errorMessage}" : string.Empty;
+                    MessageBox.Show(
+                        $"Failed to connect to {ServerNameTextBox.Text}.{detail}\n\n" +
+                        "To save this server without a working connection, uncheck \"Enable data collection for this server\".",
+                        "Connection Failed",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Error
+                    );
+                    return;
+                }
+
+                StatusText.Text = string.Empty;
+                StatusText.Visibility = System.Windows.Visibility.Collapsed;
+            }
+
             // Use server name as display name if not provided
             var displayName = string.IsNullOrWhiteSpace(DisplayNameTextBox.Text)
                 ? ServerNameTextBox.Text.Trim()
@@ -189,6 +243,7 @@ private void Save_Click(object sender, RoutedEventArgs e)
                 ServerConnection.UseWindowsAuth = WindowsAuthRadio.IsChecked == true;
                 ServerConnection.Description = DescriptionTextBox.Text.Trim();
                 ServerConnection.IsFavorite = IsFavoriteCheckBox.IsChecked == true;
+                ServerConnection.IsEnabled = IsEnabledCheckBox.IsChecked == true;
                 ServerConnection.EncryptMode = GetSelectedEncryptMode();
                 ServerConnection.TrustServerCertificate = TrustServerCertificateCheckBox.IsChecked == true;
             }
@@ -201,6 +256,7 @@ private void Save_Click(object sender, RoutedEventArgs e)
                     UseWindowsAuth = WindowsAuthRadio.IsChecked == true,
                     Description = DescriptionTextBox.Text.Trim(),
                     IsFavorite = IsFavoriteCheckBox.IsChecked == true,
+                    IsEnabled = IsEnabledCheckBox.IsChecked == true,
                     CreatedDate = DateTime.Now,
                     LastConnected = DateTime.Now,
                     EncryptMode = GetSelectedEncryptMode(),
diff --git a/Dashboard/Models/ServerConnection.cs b/Dashboard/Models/ServerConnection.cs
index 701f1de5..e05de3f3 100644
--- a/Dashboard/Models/ServerConnection.cs
+++ b/Dashboard/Models/ServerConnection.cs
@@ -23,6 +23,7 @@ public class ServerConnection
         public DateTime CreatedDate { get; set; } = DateTime.Now;
         public DateTime LastConnected { get; set; } = DateTime.Now;
         public bool IsFavorite { get; set; }
+        public bool IsEnabled { get; set; } = true;
 
         /// <summary>
         /// Encryption mode for the connection. Valid values: Optional, Mandatory, Strict.
diff --git a/Lite/Windows/AddServerDialog.xaml.cs b/Lite/Windows/AddServerDialog.xaml.cs
index 085c8960..90f824e9 100644
--- a/Lite/Windows/AddServerDialog.xaml.cs
+++ b/Lite/Windows/AddServerDialog.xaml.cs
@@ -215,7 +215,7 @@ private async void TestButton_Click(object sender, RoutedEventArgs e)
         }
     }
 
-    private void SaveButton_Click(object sender, RoutedEventArgs e)
+    private async void SaveButton_Click(object sender, RoutedEventArgs e)
     {
         var serverName = ServerNameBox.Text.Trim();
         if (string.IsNullOrEmpty(serverName))
@@ -258,6 +258,86 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        // Test connection when data collection is enabled
+        if (EnabledCheckBox.IsChecked == true)
+        {
+            SaveButton.IsEnabled = false;
+
+            if (EntraMfaAuthRadio.IsChecked == true)
+            {
+                StatusText.Text = "Testing connection — please complete authentication in the popup window...";
+            }
+            else
+            {
+                StatusText.Text = "Testing connection before saving...";
+            }
+
+            bool connected = false;
+            string? errorMessage = null;
+
+            try
+            {
+                var dbName = DatabaseNameBox.Text.Trim();
+                var builder = new SqlConnectionStringBuilder
+                {
+                    DataSource = serverName,
+                    InitialCatalog = string.IsNullOrEmpty(dbName) ? "master" : dbName,
+                    ApplicationName = "PerformanceMonitorLite",
+                    ConnectTimeout = 10,
+                    TrustServerCertificate = TrustCertCheckBox.IsChecked == true,
+                    Encrypt = ParseEncryptOption(GetSelectedEncryptMode())
+                };
+
+                if (WindowsAuthRadio.IsChecked == true)
+                {
+                    builder.IntegratedSecurity = true;
+                }
+                else if (SqlAuthRadio.IsChecked == true)
+                {
+                    builder.IntegratedSecurity = false;
+                    builder.UserID = username;
+                    builder.Password = password;
+                }
+                else if (EntraMfaAuthRadio.IsChecked == true)
+                {
+                    builder.IntegratedSecurity = false;
+                    builder.Authentication = SqlAuthenticationMethod.ActiveDirectoryInteractive;
+                    if (!string.IsNullOrEmpty(username))
+                        builder.UserID = username;
+                }
+
+                using var connection = new SqlConnection(builder.ConnectionString);
+                await connection.OpenAsync();
+                connected = true;
+            }
+            catch (Exception ex)
+            {
+                connected = false;
+                errorMessage = ex.Message;
+
+                if (AddedServer != null && EntraMfaAuthRadio.IsChecked == true && MfaAuthenticationHelper.IsMfaCancelledException(ex))
+                {
+                    var status = _serverManager.GetConnectionStatus(AddedServer.Id);
+                    status.UserCancelledMfa = true;
+                    StatusText.Text = "Authentication cancelled by user. Click Save to try again, or uncheck \"Enable data collection for this server\" to save without connecting.";
+                    SaveButton.IsEnabled = true;
+                    return;
+                }
+            }
+            finally
+            {
+                SaveButton.IsEnabled = true;
+            }
+
+            if (!connected)
+            {
+                StatusText.Text = $"Failed to connect: {errorMessage}\n\nTo save this server without a working connection, uncheck \"Enable data collection for this server\".";
+                return;
+            }
+
+            StatusText.Text = string.Empty;
+        }
+
         try
         {
             if (AddedServer != null && Title == "Edit Server")

From 1c06595e447bbbbd176d401719964e7827463615 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Wed, 25 Feb 2026 17:31:59 +0000
Subject: [PATCH 02/14] remove the "enable" from Dashboard and tidy up (remove
 duplicated connection test)

---
 Dashboard/AddServerDialog.xaml    |  11 +-
 Dashboard/AddServerDialog.xaml.cs | 183 ++++++++++++------------------
 2 files changed, 71 insertions(+), 123 deletions(-)

diff --git a/Dashboard/AddServerDialog.xaml b/Dashboard/AddServerDialog.xaml
index 881475eb..a8f2f091 100644
--- a/Dashboard/AddServerDialog.xaml
+++ b/Dashboard/AddServerDialog.xaml
@@ -26,7 +26,6 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
         <!-- Header -->
@@ -110,14 +109,6 @@
                                   IsChecked="False"
                                   Foreground="{DynamicResource ForegroundBrush}"
                                   ToolTip="When checked, accepts any server certificate without validation.&#x0a;Uncheck for stricter security (requires valid certificate)."/>
-
-                        <!-- Enable Data Collection -->
-                        <CheckBox x:Name="IsEnabledCheckBox"
-                                  Content="Enable data collection for this server"
-                                  IsChecked="True"
-                                  Foreground="{DynamicResource ForegroundBrush}"
-                                  Margin="0,10,0,0"
-                                  ToolTip="When checked, the Dashboard expects data to be collected for this server. Uncheck to save without verifying connectivity."/>
                     </StackPanel>
                 </Border>
             </StackPanel>
@@ -130,7 +121,7 @@
 
         <!-- Buttons -->
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,15,0,0">
-            <Button Content="Test Connection" Width="120" Height="30" Margin="0,0,10,0" Click="TestConnection_Click"/>
+            <Button x:Name="TestConnectionButton" Content="Test Connection" Width="120" Height="30" Margin="0,0,10,0" Click="TestConnection_Click"/>
             <Button x:Name="SaveButton" Content="Save" Width="80" Height="30" Margin="0,0,10,0" Click="Save_Click" IsDefault="True"/>
             <Button Content="Cancel" Width="80" Height="30" Click="Cancel_Click" IsCancel="True"/>
         </StackPanel>
diff --git a/Dashboard/AddServerDialog.xaml.cs b/Dashboard/AddServerDialog.xaml.cs
index 6c6acdf8..aac44740 100644
--- a/Dashboard/AddServerDialog.xaml.cs
+++ b/Dashboard/AddServerDialog.xaml.cs
@@ -8,6 +8,8 @@
 
 using System;
 using System.Windows;
+using System.Windows.Controls;
+using Microsoft.Data.SqlClient;
 using PerformanceMonitorDashboard.Models;
 using PerformanceMonitorDashboard.Services;
 
@@ -48,7 +50,6 @@ public AddServerDialog(ServerConnection existingServer)
                 _ => 0 // Optional
             };
             TrustServerCertificateCheckBox.IsChecked = existingServer.TrustServerCertificate;
-            IsEnabledCheckBox.IsChecked = existingServer.IsEnabled;
 
             if (existingServer.UseWindowsAuth)
             {
@@ -76,7 +77,7 @@ private void AuthType_Changed(object sender, RoutedEventArgs e)
             }
         }
 
-        private async void TestConnection_Click(object sender, RoutedEventArgs e)
+        private bool ValidateInputs()
         {
             if (string.IsNullOrWhiteSpace(ServerNameTextBox.Text))
             {
@@ -86,26 +87,34 @@ private async void TestConnection_Click(object sender, RoutedEventArgs e)
                     MessageBoxButton.OK,
                     MessageBoxImage.Warning
                 );
-                return;
+                return false;
             }
 
-            if (SqlAuthRadio.IsChecked == true)
+            if (SqlAuthRadio.IsChecked == true && string.IsNullOrWhiteSpace(UsernameTextBox.Text))
             {
-                if (string.IsNullOrWhiteSpace(UsernameTextBox.Text))
-                {
-                    MessageBox.Show(
-                        "Please enter a username for SQL Server authentication.",
-                        "Validation Error",
-                        MessageBoxButton.OK,
-                        MessageBoxImage.Warning
-                    );
-                    return;
-                }
+                MessageBox.Show(
+                    "Please enter a username for SQL Server authentication.",
+                    "Validation Error",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Warning
+                );
+                return false;
             }
 
+            return true;
+        }
+
+        private async System.Threading.Tasks.Task<(bool Connected, string? ErrorMessage)> RunConnectionTestAsync(Button triggerButton)
+        {
+            triggerButton.IsEnabled = false;
+            StatusText.Text = "Testing connection...";
+            StatusText.Visibility = System.Windows.Visibility.Visible;
+
+            bool connected = false;
+            string? errorMessage = null;
             try
             {
-                var testConnection = DatabaseService.BuildConnectionString(
+                var cs = DatabaseService.BuildConnectionString(
                     ServerNameTextBox.Text.Trim(),
                     WindowsAuthRadio.IsChecked == true,
                     UsernameTextBox.Text.Trim(),
@@ -114,121 +123,71 @@ private async void TestConnection_Click(object sender, RoutedEventArgs e)
                     TrustServerCertificateCheckBox.IsChecked == true
                 ).ConnectionString;
 
-                var dbService = new DatabaseService(testConnection);
-                bool connected = await dbService.TestConnectionAsync();
-
-                if (connected)
-                {
-                    MessageBox.Show(
-                        $"Successfully connected to {ServerNameTextBox.Text}!",
-                        "Connection Test Successful",
-                        MessageBoxButton.OK,
-                        MessageBoxImage.Information
-                    );
-                }
-                else
-                {
-                    MessageBox.Show(
-                        $"Failed to connect to {ServerNameTextBox.Text}.\n\nPlease check:\n" +
-                        "• Server name/address is correct\n" +
-                        "• Server is accessible from this machine\n" +
-                        "• Firewall allows SQL Server connections\n" +
-                        "• SQL Server service is running",
-                        "Connection Test Failed",
-                        MessageBoxButton.OK,
-                        MessageBoxImage.Error
-                    );
-                }
+                await using var connection = new SqlConnection(cs);
+                await connection.OpenAsync();
+                connected = true;
             }
             catch (Exception ex)
             {
-                MessageBox.Show(
-                    $"Connection test failed:\n\n{ex.Message}",
-                    "Connection Test Error",
-                    MessageBoxButton.OK,
-                    MessageBoxImage.Error
-                );
+                connected = false;
+                errorMessage = ex.Message;
+            }
+            finally
+            {
+                triggerButton.IsEnabled = true;
+                StatusText.Text = string.Empty;
+                StatusText.Visibility = System.Windows.Visibility.Collapsed;
             }
+
+            return (connected, errorMessage);
         }
 
-        private async void Save_Click(object sender, RoutedEventArgs e)
+        private async void TestConnection_Click(object sender, RoutedEventArgs e)
         {
-            if (string.IsNullOrWhiteSpace(ServerNameTextBox.Text))
+            if (!ValidateInputs()) return;
+
+            var (connected, errorMessage) = await RunConnectionTestAsync(TestConnectionButton);
+
+            if (connected)
             {
                 MessageBox.Show(
-                    "Please enter a server name or address.",
-                    "Validation Error",
+                    $"Successfully connected to {ServerNameTextBox.Text}!",
+                    "Connection Successful",
                     MessageBoxButton.OK,
-                    MessageBoxImage.Warning
+                    MessageBoxImage.Information
                 );
-                return;
             }
-
-            if (SqlAuthRadio.IsChecked == true)
+            else
             {
-                if (string.IsNullOrWhiteSpace(UsernameTextBox.Text))
-                {
-                    MessageBox.Show(
-                        "Please enter a username for SQL Server authentication.",
-                        "Validation Error",
-                        MessageBoxButton.OK,
-                        MessageBoxImage.Warning
-                    );
-                    return;
-                }
+                var detail = errorMessage != null ? $"\n\nError: {errorMessage}" : string.Empty;
+                MessageBox.Show(
+                    $"Could not connect to {ServerNameTextBox.Text}.{detail}",
+                    "Connection Failed",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Error
+                );
             }
+        }
 
-            // Test connection when data collection is enabled
-            if (IsEnabledCheckBox.IsChecked == true)
-            {
-                SaveButton.IsEnabled = false;
-                StatusText.Text = "Testing connection...";
-                StatusText.Visibility = System.Windows.Visibility.Visible;
-
-                bool connected;
-                string? errorMessage = null;
-                try
-                {
-                    var cs = DatabaseService.BuildConnectionString(
-                        ServerNameTextBox.Text.Trim(),
-                        WindowsAuthRadio.IsChecked == true,
-                        UsernameTextBox.Text.Trim(),
-                        PasswordBox.Password,
-                        GetSelectedEncryptMode(),
-                        TrustServerCertificateCheckBox.IsChecked == true
-                    ).ConnectionString;
+        private async void Save_Click(object sender, RoutedEventArgs e)
+        {
+            if (!ValidateInputs()) return;
 
-                    var dbService = new DatabaseService(cs);
-                    connected = await dbService.TestConnectionAsync();
-                }
-                catch (Exception ex)
-                {
-                    connected = false;
-                    errorMessage = ex.Message;
-                }
-                finally
-                {
-                    SaveButton.IsEnabled = true;
-                }
+            var (connected, errorMessage) = await RunConnectionTestAsync(SaveButton);
 
-                if (!connected)
-                {
-                    StatusText.Text = string.Empty;
-                    StatusText.Visibility = System.Windows.Visibility.Collapsed;
+            if (!connected)
+            {
+                var detail = errorMessage != null ? $"\n\nError: {errorMessage}" : string.Empty;
+                var result = MessageBox.Show(
+                    $"Could not connect to {ServerNameTextBox.Text}.{detail}\n\n" +
+                    "Do you still want to save this connection?",
+                    "Connection Failed",
+                    MessageBoxButton.YesNo,
+                    MessageBoxImage.Warning
+                );
 
-                    var detail = errorMessage != null ? $"\n\nError: {errorMessage}" : string.Empty;
-                    MessageBox.Show(
-                        $"Failed to connect to {ServerNameTextBox.Text}.{detail}\n\n" +
-                        "To save this server without a working connection, uncheck \"Enable data collection for this server\".",
-                        "Connection Failed",
-                        MessageBoxButton.OK,
-                        MessageBoxImage.Error
-                    );
+                if (result != MessageBoxResult.Yes)
                     return;
-                }
-
-                StatusText.Text = string.Empty;
-                StatusText.Visibility = System.Windows.Visibility.Collapsed;
             }
 
             // Use server name as display name if not provided
@@ -243,7 +202,6 @@ private async void Save_Click(object sender, RoutedEventArgs e)
                 ServerConnection.UseWindowsAuth = WindowsAuthRadio.IsChecked == true;
                 ServerConnection.Description = DescriptionTextBox.Text.Trim();
                 ServerConnection.IsFavorite = IsFavoriteCheckBox.IsChecked == true;
-                ServerConnection.IsEnabled = IsEnabledCheckBox.IsChecked == true;
                 ServerConnection.EncryptMode = GetSelectedEncryptMode();
                 ServerConnection.TrustServerCertificate = TrustServerCertificateCheckBox.IsChecked == true;
             }
@@ -256,7 +214,6 @@ private async void Save_Click(object sender, RoutedEventArgs e)
                     UseWindowsAuth = WindowsAuthRadio.IsChecked == true,
                     Description = DescriptionTextBox.Text.Trim(),
                     IsFavorite = IsFavoriteCheckBox.IsChecked == true,
-                    IsEnabled = IsEnabledCheckBox.IsChecked == true,
                     CreatedDate = DateTime.Now,
                     LastConnected = DateTime.Now,
                     EncryptMode = GetSelectedEncryptMode(),

From 97f982da3a9af06bbce05ba637ff295cd81cc2cb Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Wed, 25 Feb 2026 17:32:39 +0000
Subject: [PATCH 03/14] disable "Save" button when testing the connection

---
 Dashboard/AddServerDialog.xaml.cs    | 2 ++
 Lite/Windows/AddServerDialog.xaml.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Dashboard/AddServerDialog.xaml.cs b/Dashboard/AddServerDialog.xaml.cs
index aac44740..b0c1f886 100644
--- a/Dashboard/AddServerDialog.xaml.cs
+++ b/Dashboard/AddServerDialog.xaml.cs
@@ -107,6 +107,7 @@ private bool ValidateInputs()
         private async System.Threading.Tasks.Task<(bool Connected, string? ErrorMessage)> RunConnectionTestAsync(Button triggerButton)
         {
             triggerButton.IsEnabled = false;
+            SaveButton.IsEnabled = false;
             StatusText.Text = "Testing connection...";
             StatusText.Visibility = System.Windows.Visibility.Visible;
 
@@ -135,6 +136,7 @@ private bool ValidateInputs()
             finally
             {
                 triggerButton.IsEnabled = true;
+                SaveButton.IsEnabled = true;
                 StatusText.Text = string.Empty;
                 StatusText.Visibility = System.Windows.Visibility.Collapsed;
             }
diff --git a/Lite/Windows/AddServerDialog.xaml.cs b/Lite/Windows/AddServerDialog.xaml.cs
index 90f824e9..266b7ba0 100644
--- a/Lite/Windows/AddServerDialog.xaml.cs
+++ b/Lite/Windows/AddServerDialog.xaml.cs
@@ -140,6 +140,7 @@ private async void TestButton_Click(object sender, RoutedEventArgs e)
         }
 
         TestButton.IsEnabled = false;
+        SaveButton.IsEnabled = false;
         StatusText.Text = "Testing connection...";
 
         try
@@ -212,6 +213,7 @@ private async void TestButton_Click(object sender, RoutedEventArgs e)
         finally
         {
             TestButton.IsEnabled = true;
+            SaveButton.IsEnabled = true;
         }
     }
 

From e3965ae42a5c03c8cea67910b748d378401994ed Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Wed, 25 Feb 2026 18:14:27 +0000
Subject: [PATCH 04/14] tidy up code (remove duplicated code too)

---
 Lite/Windows/AddServerDialog.xaml.cs | 214 +++++++++++----------------
 1 file changed, 87 insertions(+), 127 deletions(-)

diff --git a/Lite/Windows/AddServerDialog.xaml.cs b/Lite/Windows/AddServerDialog.xaml.cs
index 266b7ba0..25cc6cf4 100644
--- a/Lite/Windows/AddServerDialog.xaml.cs
+++ b/Lite/Windows/AddServerDialog.xaml.cs
@@ -130,90 +130,107 @@ private static SqlConnectionEncryptOption ParseEncryptOption(string mode)
         };
     }
 
-    private async void TestButton_Click(object sender, RoutedEventArgs e)
+    private SqlConnectionStringBuilder BuildConnectionBuilder()
     {
-        var serverName = ServerNameBox.Text.Trim();
-        if (string.IsNullOrEmpty(serverName))
+        var dbName = DatabaseNameBox.Text.Trim();
+        var builder = new SqlConnectionStringBuilder
         {
-            StatusText.Text = "Enter a server name first.";
-            return;
+            DataSource = ServerNameBox.Text.Trim(),
+            InitialCatalog = string.IsNullOrEmpty(dbName) ? "master" : dbName,
+            ApplicationName = "PerformanceMonitorLite",
+            ConnectTimeout = 10,
+            TrustServerCertificate = TrustCertCheckBox.IsChecked == true,
+            Encrypt = ParseEncryptOption(GetSelectedEncryptMode())
+        };
+
+        if (WindowsAuthRadio.IsChecked == true)
+        {
+            builder.IntegratedSecurity = true;
+        }
+        else if (SqlAuthRadio.IsChecked == true)
+        {
+            builder.IntegratedSecurity = false;
+            builder.UserID = UsernameBox.Text.Trim();
+            builder.Password = PasswordBox.Password;
+        }
+        else if (EntraMfaAuthRadio.IsChecked == true)
+        {
+            builder.IntegratedSecurity = false;
+            builder.Authentication = SqlAuthenticationMethod.ActiveDirectoryInteractive;
+            var mfaUsername = EntraMfaUsernameBox.Text.Trim();
+            if (!string.IsNullOrEmpty(mfaUsername))
+                builder.UserID = mfaUsername;
         }
 
+        return builder;
+    }
+
+    private async System.Threading.Tasks.Task<(bool Connected, string? ErrorMessage, bool MfaCancelled)> RunConnectionTestAsync()
+    {
         TestButton.IsEnabled = false;
         SaveButton.IsEnabled = false;
-        StatusText.Text = "Testing connection...";
+
+        StatusText.Text = EntraMfaAuthRadio.IsChecked == true
+            ? "Testing connection — please complete authentication in the popup window..."
+            : "Testing connection...";
+
+        bool connected = false;
+        string? errorMessage = null;
+        bool mfaCancelled = false;
 
         try
         {
-            var dbName = DatabaseNameBox.Text.Trim();
-            var builder = new SqlConnectionStringBuilder
-            {
-                DataSource = serverName,
-                InitialCatalog = string.IsNullOrEmpty(dbName) ? "master" : dbName,
-                ApplicationName = "PerformanceMonitorLite",
-                ConnectTimeout = 10,
-                TrustServerCertificate = TrustCertCheckBox.IsChecked == true,
-                Encrypt = ParseEncryptOption(GetSelectedEncryptMode())
-            };
-
-            if (WindowsAuthRadio.IsChecked == true)
-            {
-                builder.IntegratedSecurity = true;
-            }
-            else if (SqlAuthRadio.IsChecked == true)
-            {
-                builder.IntegratedSecurity = false;
-                builder.UserID = UsernameBox.Text.Trim();
-                builder.Password = PasswordBox.Password;
-            }
-            else if (EntraMfaAuthRadio.IsChecked == true)
-            {
-                // Microsoft Entra MFA (Azure AD Interactive)
-                builder.IntegratedSecurity = false;
-                builder.Authentication = SqlAuthenticationMethod.ActiveDirectoryInteractive;
-                
-                // Optional: Use username if provided
-                var username = EntraMfaUsernameBox.Text.Trim();
-                if (!string.IsNullOrEmpty(username))
-                {
-                    builder.UserID = username;
-                }
-                
-                StatusText.Text = "Please complete authentication in the popup window...";
-            }
-
-            using var connection = new SqlConnection(builder.ConnectionString);
+            using var connection = new SqlConnection(BuildConnectionBuilder().ConnectionString);
             await connection.OpenAsync();
+            connected = true;
+        }
+        catch (Exception ex)
+        {
+            errorMessage = ex.Message;
+            if (EntraMfaAuthRadio.IsChecked == true && MfaAuthenticationHelper.IsMfaCancelledException(ex))
+                mfaCancelled = true;
+        }
+        finally
+        {
+            TestButton.IsEnabled = true;
+            SaveButton.IsEnabled = true;
+        }
 
-            using var cmd = new SqlCommand("SELECT @@VERSION", connection);
-            var version = await cmd.ExecuteScalarAsync() as string;
-            var shortVersion = version?.Split('\n')[0] ?? "Connected";
+        return (connected, errorMessage, mfaCancelled);
+    }
+
+    private async void TestButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (string.IsNullOrEmpty(ServerNameBox.Text.Trim()))
+        {
+            StatusText.Text = "Enter a server name first.";
+            return;
+        }
+
+        var (connected, errorMessage, mfaCancelled) = await RunConnectionTestAsync();
+
+        if (connected)
+        {
+            StatusText.Text = $"Successfully connected to {ServerNameBox.Text.Trim()}!";
 
-            StatusText.Text = $"Success: {shortVersion}";
-            
-            // Clear any previous MFA cancellation flag on successful connection
             if (AddedServer != null && EntraMfaAuthRadio.IsChecked == true)
             {
                 var status = _serverManager.GetConnectionStatus(AddedServer.Id);
                 status.UserCancelledMfa = false;
             }
         }
-        catch (Exception ex)
+        else if (mfaCancelled)
         {
-            StatusText.Text = $"Failed: {ex.Message}";
-            
-            // Mark MFA as cancelled if user cancelled the authentication popup
-            if (AddedServer != null && EntraMfaAuthRadio.IsChecked == true && MfaAuthenticationHelper.IsMfaCancelledException(ex))
+            if (AddedServer != null)
             {
                 var status = _serverManager.GetConnectionStatus(AddedServer.Id);
                 status.UserCancelledMfa = true;
-                StatusText.Text = "Authentication cancelled by user. Click Test to try again.";
             }
+            StatusText.Text = "Authentication cancelled by user. Click Test to try again.";
         }
-        finally
+        else
         {
-            TestButton.IsEnabled = true;
-            SaveButton.IsEnabled = true;
+            StatusText.Text = $"Failed: {errorMessage}";
         }
     }
 
@@ -228,9 +245,7 @@ private async void SaveButton_Click(object sender, RoutedEventArgs e)
 
         var displayName = DisplayNameBox.Text.Trim();
         if (string.IsNullOrEmpty(displayName))
-        {
             displayName = serverName;
-        }
 
         // Determine authentication type
         string authenticationType;
@@ -244,7 +259,6 @@ private async void SaveButton_Click(object sender, RoutedEventArgs e)
         else if (EntraMfaAuthRadio.IsChecked == true)
         {
             authenticationType = AuthenticationTypes.EntraMFA;
-            // Optionally store username for MFA
             username = EntraMfaUsernameBox.Text.Trim();
         }
         else // SQL Server Authentication
@@ -263,77 +277,23 @@ private async void SaveButton_Click(object sender, RoutedEventArgs e)
         // Test connection when data collection is enabled
         if (EnabledCheckBox.IsChecked == true)
         {
-            SaveButton.IsEnabled = false;
-
-            if (EntraMfaAuthRadio.IsChecked == true)
-            {
-                StatusText.Text = "Testing connection — please complete authentication in the popup window...";
-            }
-            else
-            {
-                StatusText.Text = "Testing connection before saving...";
-            }
-
-            bool connected = false;
-            string? errorMessage = null;
+            var (connected, errorMessage, mfaCancelled) = await RunConnectionTestAsync();
 
-            try
+            if (!connected)
             {
-                var dbName = DatabaseNameBox.Text.Trim();
-                var builder = new SqlConnectionStringBuilder
-                {
-                    DataSource = serverName,
-                    InitialCatalog = string.IsNullOrEmpty(dbName) ? "master" : dbName,
-                    ApplicationName = "PerformanceMonitorLite",
-                    ConnectTimeout = 10,
-                    TrustServerCertificate = TrustCertCheckBox.IsChecked == true,
-                    Encrypt = ParseEncryptOption(GetSelectedEncryptMode())
-                };
-
-                if (WindowsAuthRadio.IsChecked == true)
+                if (mfaCancelled)
                 {
-                    builder.IntegratedSecurity = true;
-                }
-                else if (SqlAuthRadio.IsChecked == true)
-                {
-                    builder.IntegratedSecurity = false;
-                    builder.UserID = username;
-                    builder.Password = password;
+                    if (AddedServer != null)
+                    {
+                        var status = _serverManager.GetConnectionStatus(AddedServer.Id);
+                        status.UserCancelledMfa = true;
+                    }
+                    StatusText.Text = "Authentication cancelled by user. Click Save to try again, or uncheck \"Enable data collection for this server\" to save without connecting.";
                 }
-                else if (EntraMfaAuthRadio.IsChecked == true)
+                else
                 {
-                    builder.IntegratedSecurity = false;
-                    builder.Authentication = SqlAuthenticationMethod.ActiveDirectoryInteractive;
-                    if (!string.IsNullOrEmpty(username))
-                        builder.UserID = username;
+                    StatusText.Text = $"Failed to connect: {errorMessage}\n\nTo save this server without a working connection, uncheck \"Enable data collection for this server\".";
                 }
-
-                using var connection = new SqlConnection(builder.ConnectionString);
-                await connection.OpenAsync();
-                connected = true;
-            }
-            catch (Exception ex)
-            {
-                connected = false;
-                errorMessage = ex.Message;
-
-                if (AddedServer != null && EntraMfaAuthRadio.IsChecked == true && MfaAuthenticationHelper.IsMfaCancelledException(ex))
-                {
-                    var status = _serverManager.GetConnectionStatus(AddedServer.Id);
-                    status.UserCancelledMfa = true;
-                    StatusText.Text = "Authentication cancelled by user. Click Save to try again, or uncheck \"Enable data collection for this server\" to save without connecting.";
-                    SaveButton.IsEnabled = true;
-                    return;
-                }
-            }
-            finally
-            {
-                SaveButton.IsEnabled = true;
-            }
-
-            if (!connected)
-            {
-                StatusText.Text = $"Failed to connect: {errorMessage}\n\nTo save this server without a working connection, uncheck \"Enable data collection for this server\".";
                 return;
             }
 

From cb80a638462be17fc83284c4568dd216f8f8b409 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 26 Feb 2026 10:01:58 +0000
Subject: [PATCH 05/14] Fix "Dashboard XAML missing RowDefinition"

---
 Dashboard/AddServerDialog.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dashboard/AddServerDialog.xaml b/Dashboard/AddServerDialog.xaml
index a8f2f091..f88d8c7f 100644
--- a/Dashboard/AddServerDialog.xaml
+++ b/Dashboard/AddServerDialog.xaml
@@ -26,6 +26,7 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
         <!-- Header -->

From d8bf9204ba1e35c8c3bfdcdbd07e02d9957caa8f Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 26 Feb 2026 10:03:54 +0000
Subject: [PATCH 06/14] Remove "IsEnabled" property

---
 Dashboard/Models/ServerConnection.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dashboard/Models/ServerConnection.cs b/Dashboard/Models/ServerConnection.cs
index e05de3f3..701f1de5 100644
--- a/Dashboard/Models/ServerConnection.cs
+++ b/Dashboard/Models/ServerConnection.cs
@@ -23,7 +23,6 @@ public class ServerConnection
         public DateTime CreatedDate { get; set; } = DateTime.Now;
         public DateTime LastConnected { get; set; } = DateTime.Now;
         public bool IsFavorite { get; set; }
-        public bool IsEnabled { get; set; } = true;
 
         /// <summary>
         /// Encryption mode for the connection. Valid values: Optional, Mandatory, Strict.

From fb49c1cc364daf7dde136cc0c374a165d53758bb Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 26 Feb 2026 10:06:56 +0000
Subject: [PATCH 07/14] Put "SELECT @@VERSION" in the connection test back for
 Lite

---
 Lite/Windows/AddServerDialog.xaml.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Lite/Windows/AddServerDialog.xaml.cs b/Lite/Windows/AddServerDialog.xaml.cs
index 25cc6cf4..80ff3c20 100644
--- a/Lite/Windows/AddServerDialog.xaml.cs
+++ b/Lite/Windows/AddServerDialog.xaml.cs
@@ -165,7 +165,7 @@ private SqlConnectionStringBuilder BuildConnectionBuilder()
         return builder;
     }
 
-    private async System.Threading.Tasks.Task<(bool Connected, string? ErrorMessage, bool MfaCancelled)> RunConnectionTestAsync()
+    private async System.Threading.Tasks.Task<(bool Connected, string? ErrorMessage, bool MfaCancelled, string? ServerVersion)> RunConnectionTestAsync()
     {
         TestButton.IsEnabled = false;
         SaveButton.IsEnabled = false;
@@ -177,11 +177,15 @@ private SqlConnectionStringBuilder BuildConnectionBuilder()
         bool connected = false;
         string? errorMessage = null;
         bool mfaCancelled = false;
+        string? serverVersion = null;
 
         try
         {
             using var connection = new SqlConnection(BuildConnectionBuilder().ConnectionString);
             await connection.OpenAsync();
+            using var cmd = new SqlCommand("SELECT @@VERSION", connection);
+            var version = await cmd.ExecuteScalarAsync() as string;
+            serverVersion = version?.Split('\n')[0]?.Trim();
             connected = true;
         }
         catch (Exception ex)
@@ -196,7 +200,7 @@ private SqlConnectionStringBuilder BuildConnectionBuilder()
             SaveButton.IsEnabled = true;
         }
 
-        return (connected, errorMessage, mfaCancelled);
+        return (connected, errorMessage, mfaCancelled, serverVersion);
     }
 
     private async void TestButton_Click(object sender, RoutedEventArgs e)
@@ -207,11 +211,13 @@ private async void TestButton_Click(object sender, RoutedEventArgs e)
             return;
         }
 
-        var (connected, errorMessage, mfaCancelled) = await RunConnectionTestAsync();
+        var (connected, errorMessage, mfaCancelled, serverVersion) = await RunConnectionTestAsync();
 
         if (connected)
         {
-            StatusText.Text = $"Successfully connected to {ServerNameBox.Text.Trim()}!";
+            StatusText.Text = serverVersion != null
+                ? $"Success: {serverVersion}"
+                : $"Successfully connected to {ServerNameBox.Text.Trim()}!";
 
             if (AddedServer != null && EntraMfaAuthRadio.IsChecked == true)
             {
@@ -277,7 +283,7 @@ private async void SaveButton_Click(object sender, RoutedEventArgs e)
         // Test connection when data collection is enabled
         if (EnabledCheckBox.IsChecked == true)
         {
-            var (connected, errorMessage, mfaCancelled) = await RunConnectionTestAsync();
+            var (connected, errorMessage, mfaCancelled, _) = await RunConnectionTestAsync();
 
             if (!connected)
             {

From 1c34344965ac737810e302bd6c7a4d880f2ea6e8 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 26 Feb 2026 10:08:27 +0000
Subject: [PATCH 08/14] Put "SELECT @@VERSION" in the connection test in
 Dashboard too

---
 Dashboard/AddServerDialog.xaml.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Dashboard/AddServerDialog.xaml.cs b/Dashboard/AddServerDialog.xaml.cs
index b0c1f886..272c0d40 100644
--- a/Dashboard/AddServerDialog.xaml.cs
+++ b/Dashboard/AddServerDialog.xaml.cs
@@ -104,7 +104,7 @@ private bool ValidateInputs()
             return true;
         }
 
-        private async System.Threading.Tasks.Task<(bool Connected, string? ErrorMessage)> RunConnectionTestAsync(Button triggerButton)
+        private async System.Threading.Tasks.Task<(bool Connected, string? ErrorMessage, string? ServerVersion)> RunConnectionTestAsync(Button triggerButton)
         {
             triggerButton.IsEnabled = false;
             SaveButton.IsEnabled = false;
@@ -113,6 +113,7 @@ private bool ValidateInputs()
 
             bool connected = false;
             string? errorMessage = null;
+            string? serverVersion = null;
             try
             {
                 var cs = DatabaseService.BuildConnectionString(
@@ -126,6 +127,9 @@ private bool ValidateInputs()
 
                 await using var connection = new SqlConnection(cs);
                 await connection.OpenAsync();
+                using var cmd = new SqlCommand("SELECT @@VERSION", connection);
+                var version = await cmd.ExecuteScalarAsync() as string;
+                serverVersion = version?.Split('\n')[0]?.Trim();
                 connected = true;
             }
             catch (Exception ex)
@@ -141,19 +145,22 @@ private bool ValidateInputs()
                 StatusText.Visibility = System.Windows.Visibility.Collapsed;
             }
 
-            return (connected, errorMessage);
+            return (connected, errorMessage, serverVersion);
         }
 
         private async void TestConnection_Click(object sender, RoutedEventArgs e)
         {
             if (!ValidateInputs()) return;
 
-            var (connected, errorMessage) = await RunConnectionTestAsync(TestConnectionButton);
+            var (connected, errorMessage, serverVersion) = await RunConnectionTestAsync(TestConnectionButton);
 
             if (connected)
             {
+                var message = serverVersion != null
+                    ? $"Successfully connected to {ServerNameTextBox.Text}!\n\n{serverVersion}"
+                    : $"Successfully connected to {ServerNameTextBox.Text}!";
                 MessageBox.Show(
-                    $"Successfully connected to {ServerNameTextBox.Text}!",
+                    message,
                     "Connection Successful",
                     MessageBoxButton.OK,
                     MessageBoxImage.Information
@@ -175,7 +182,7 @@ private async void Save_Click(object sender, RoutedEventArgs e)
         {
             if (!ValidateInputs()) return;
 
-            var (connected, errorMessage) = await RunConnectionTestAsync(SaveButton);
+            var (connected, errorMessage, _) = await RunConnectionTestAsync(SaveButton);
 
             if (!connected)
             {

From b93a48b3af2604421ae095023b8dde63177f0040 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 26 Feb 2026 10:19:55 +0000
Subject: [PATCH 09/14] Use SqlConnectionStringBuilder as Lite

---
 Dashboard/AddServerDialog.xaml.cs | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/Dashboard/AddServerDialog.xaml.cs b/Dashboard/AddServerDialog.xaml.cs
index 272c0d40..9a5df62d 100644
--- a/Dashboard/AddServerDialog.xaml.cs
+++ b/Dashboard/AddServerDialog.xaml.cs
@@ -116,16 +116,29 @@ private bool ValidateInputs()
             string? serverVersion = null;
             try
             {
-                var cs = DatabaseService.BuildConnectionString(
-                    ServerNameTextBox.Text.Trim(),
-                    WindowsAuthRadio.IsChecked == true,
-                    UsernameTextBox.Text.Trim(),
-                    PasswordBox.Password,
-                    GetSelectedEncryptMode(),
-                    TrustServerCertificateCheckBox.IsChecked == true
-                ).ConnectionString;
+                var builder = new SqlConnectionStringBuilder
+                {
+                    DataSource = ServerNameTextBox.Text.Trim(),
+                    InitialCatalog = "PerformanceMonitor",
+                    ApplicationName = "PerformanceMonitorDashboard",
+                    ConnectTimeout = 10,
+                    TrustServerCertificate = TrustServerCertificateCheckBox.IsChecked == true,
+                    Encrypt = GetSelectedEncryptMode() switch
+                    {
+                        "Strict" => SqlConnectionEncryptOption.Strict,
+                        "Optional" => SqlConnectionEncryptOption.Optional,
+                        _ => SqlConnectionEncryptOption.Mandatory
+                    },
+                    IntegratedSecurity = WindowsAuthRadio.IsChecked == true
+                };
+
+                if (WindowsAuthRadio.IsChecked != true)
+                {
+                    builder.UserID = UsernameTextBox.Text.Trim();
+                    builder.Password = PasswordBox.Password;
+                }
 
-                await using var connection = new SqlConnection(cs);
+                await using var connection = new SqlConnection(builder.ConnectionString);
                 await connection.OpenAsync();
                 using var cmd = new SqlCommand("SELECT @@VERSION", connection);
                 var version = await cmd.ExecuteScalarAsync() as string;

From ac615aeabfbfa6c7fab12a30e4176520a1461b54 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 26 Feb 2026 10:31:23 +0000
Subject: [PATCH 10/14] Tidy code like Lite

---
 Dashboard/AddServerDialog.xaml.cs | 75 ++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 32 deletions(-)

diff --git a/Dashboard/AddServerDialog.xaml.cs b/Dashboard/AddServerDialog.xaml.cs
index 9a5df62d..dce20828 100644
--- a/Dashboard/AddServerDialog.xaml.cs
+++ b/Dashboard/AddServerDialog.xaml.cs
@@ -77,6 +77,48 @@ private void AuthType_Changed(object sender, RoutedEventArgs e)
             }
         }
 
+        private string GetSelectedEncryptMode()
+        {
+            return EncryptModeComboBox.SelectedIndex switch
+            {
+                1 => "Mandatory",
+                2 => "Strict",
+                _ => "Optional"
+            };
+        }
+
+        private static SqlConnectionEncryptOption ParseEncryptOption(string mode)
+        {
+            return mode switch
+            {
+                "Mandatory" => SqlConnectionEncryptOption.Mandatory,
+                "Strict" => SqlConnectionEncryptOption.Strict,
+                _ => SqlConnectionEncryptOption.Optional
+            };
+        }
+
+        private SqlConnectionStringBuilder BuildConnectionBuilder()
+        {
+            var builder = new SqlConnectionStringBuilder
+            {
+                DataSource = ServerNameTextBox.Text.Trim(),
+                InitialCatalog = "PerformanceMonitor",
+                ApplicationName = "PerformanceMonitorDashboard",
+                ConnectTimeout = 10,
+                TrustServerCertificate = TrustServerCertificateCheckBox.IsChecked == true,
+                Encrypt = ParseEncryptOption(GetSelectedEncryptMode()),
+                IntegratedSecurity = WindowsAuthRadio.IsChecked == true
+            };
+
+            if (WindowsAuthRadio.IsChecked != true)
+            {
+                builder.UserID = UsernameTextBox.Text.Trim();
+                builder.Password = PasswordBox.Password;
+            }
+
+            return builder;
+        }
+
         private bool ValidateInputs()
         {
             if (string.IsNullOrWhiteSpace(ServerNameTextBox.Text))
@@ -116,29 +158,7 @@ private bool ValidateInputs()
             string? serverVersion = null;
             try
             {
-                var builder = new SqlConnectionStringBuilder
-                {
-                    DataSource = ServerNameTextBox.Text.Trim(),
-                    InitialCatalog = "PerformanceMonitor",
-                    ApplicationName = "PerformanceMonitorDashboard",
-                    ConnectTimeout = 10,
-                    TrustServerCertificate = TrustServerCertificateCheckBox.IsChecked == true,
-                    Encrypt = GetSelectedEncryptMode() switch
-                    {
-                        "Strict" => SqlConnectionEncryptOption.Strict,
-                        "Optional" => SqlConnectionEncryptOption.Optional,
-                        _ => SqlConnectionEncryptOption.Mandatory
-                    },
-                    IntegratedSecurity = WindowsAuthRadio.IsChecked == true
-                };
-
-                if (WindowsAuthRadio.IsChecked != true)
-                {
-                    builder.UserID = UsernameTextBox.Text.Trim();
-                    builder.Password = PasswordBox.Password;
-                }
-
-                await using var connection = new SqlConnection(builder.ConnectionString);
+                await using var connection = new SqlConnection(BuildConnectionBuilder().ConnectionString);
                 await connection.OpenAsync();
                 using var cmd = new SqlCommand("SELECT @@VERSION", connection);
                 var version = await cmd.ExecuteScalarAsync() as string;
@@ -259,14 +279,5 @@ private void Cancel_Click(object sender, RoutedEventArgs e)
             Close();
         }
 
-        private string GetSelectedEncryptMode()
-        {
-            return EncryptModeComboBox.SelectedIndex switch
-            {
-                1 => "Mandatory",
-                2 => "Strict",
-                _ => "Optional"
-            };
-        }
     }
 }

From 0ae6d9220a30d3a32137e1484ec73aea9db153a2 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 26 Feb 2026 10:32:28 +0000
Subject: [PATCH 11/14] Lite: Add Failure feedback using MessageBox, not inline
 StatusText

---
 Lite/Windows/AddServerDialog.xaml.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Lite/Windows/AddServerDialog.xaml.cs b/Lite/Windows/AddServerDialog.xaml.cs
index 80ff3c20..cb2d9257 100644
--- a/Lite/Windows/AddServerDialog.xaml.cs
+++ b/Lite/Windows/AddServerDialog.xaml.cs
@@ -294,16 +294,25 @@ private async void SaveButton_Click(object sender, RoutedEventArgs e)
                         var status = _serverManager.GetConnectionStatus(AddedServer.Id);
                         status.UserCancelledMfa = true;
                     }
-                    StatusText.Text = "Authentication cancelled by user. Click Save to try again, or uncheck \"Enable data collection for this server\" to save without connecting.";
+                    MessageBox.Show(
+                        "Authentication was cancelled. Click Save to try again, or uncheck \"Enable data collection for this server\" to save without connecting.",
+                        "Authentication Cancelled",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Warning
+                    );
                 }
                 else
                 {
-                    StatusText.Text = $"Failed to connect: {errorMessage}\n\nTo save this server without a working connection, uncheck \"Enable data collection for this server\".";
+                    var detail = errorMessage != null ? $"\n\nError: {errorMessage}" : string.Empty;
+                    MessageBox.Show(
+                        $"Could not connect to {ServerNameBox.Text.Trim()}.{detail}\n\nTo save this server without a working connection, uncheck \"Enable data collection for this server\".",
+                        "Connection Failed",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Error
+                    );
                 }
                 return;
             }
-
-            StatusText.Text = string.Empty;
         }
 
         try

From 0c541639f265ce09e1018ff1fc4846e44f8b8bb6 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 26 Feb 2026 10:37:40 +0000
Subject: [PATCH 12/14] Lite: Use MessageBox also for "Test Connection"

---
 Lite/Windows/AddServerDialog.xaml.cs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Lite/Windows/AddServerDialog.xaml.cs b/Lite/Windows/AddServerDialog.xaml.cs
index cb2d9257..fa4abc3f 100644
--- a/Lite/Windows/AddServerDialog.xaml.cs
+++ b/Lite/Windows/AddServerDialog.xaml.cs
@@ -215,9 +215,10 @@ private async void TestButton_Click(object sender, RoutedEventArgs e)
 
         if (connected)
         {
-            StatusText.Text = serverVersion != null
-                ? $"Success: {serverVersion}"
+            var message = serverVersion != null
+                ? $"Successfully connected to {ServerNameBox.Text.Trim()}!\n\n{serverVersion}"
                 : $"Successfully connected to {ServerNameBox.Text.Trim()}!";
+            MessageBox.Show(message, "Connection Successful", MessageBoxButton.OK, MessageBoxImage.Information);
 
             if (AddedServer != null && EntraMfaAuthRadio.IsChecked == true)
             {
@@ -232,11 +233,22 @@ private async void TestButton_Click(object sender, RoutedEventArgs e)
                 var status = _serverManager.GetConnectionStatus(AddedServer.Id);
                 status.UserCancelledMfa = true;
             }
-            StatusText.Text = "Authentication cancelled by user. Click Test to try again.";
+            MessageBox.Show(
+                "Authentication was cancelled. Click Test to try again.",
+                "Authentication Cancelled",
+                MessageBoxButton.OK,
+                MessageBoxImage.Warning
+            );
         }
         else
         {
-            StatusText.Text = $"Failed: {errorMessage}";
+            var detail = errorMessage != null ? $"\n\nError: {errorMessage}" : string.Empty;
+            MessageBox.Show(
+                $"Could not connect to {ServerNameBox.Text.Trim()}.{detail}",
+                "Connection Failed",
+                MessageBoxButton.OK,
+                MessageBoxImage.Error
+            );
         }
     }
 

From f99e81e6616c9935e833d19e0d21b5854c865bc5 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 26 Feb 2026 10:42:28 +0000
Subject: [PATCH 13/14] Clear StatusText label after test

---
 Lite/Windows/AddServerDialog.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Lite/Windows/AddServerDialog.xaml.cs b/Lite/Windows/AddServerDialog.xaml.cs
index fa4abc3f..3e70d8af 100644
--- a/Lite/Windows/AddServerDialog.xaml.cs
+++ b/Lite/Windows/AddServerDialog.xaml.cs
@@ -198,6 +198,7 @@ private SqlConnectionStringBuilder BuildConnectionBuilder()
         {
             TestButton.IsEnabled = true;
             SaveButton.IsEnabled = true;
+            StatusText.Text = string.Empty;
         }
 
         return (connected, errorMessage, mfaCancelled, serverVersion);

From 17df4a96dc28722556b3faae31d0764edcc9bb01 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 26 Feb 2026 11:38:22 +0000
Subject: [PATCH 14/14] Add MFA to Dashboard

---
 Dashboard/AddServerDialog.xaml               |  39 +++---
 Dashboard/AddServerDialog.xaml.cs            | 122 +++++++++++++++----
 Dashboard/Helpers/MfaAuthenticationHelper.cs |  35 ++++++
 Dashboard/Interfaces/IServerManager.cs       |   2 +-
 Dashboard/MainWindow.xaml.cs                 |   4 +-
 Dashboard/Models/AuthenticationTypes.cs      |  31 +++++
 Dashboard/Models/ServerConnection.cs         |  69 ++++++++++-
 Dashboard/Models/ServerConnectionStatus.cs   |   6 +
 Dashboard/Services/ServerManager.cs          |  71 ++++++++++-
 9 files changed, 328 insertions(+), 51 deletions(-)
 create mode 100644 Dashboard/Helpers/MfaAuthenticationHelper.cs
 create mode 100644 Dashboard/Models/AuthenticationTypes.cs

diff --git a/Dashboard/AddServerDialog.xaml b/Dashboard/AddServerDialog.xaml
index f88d8c7f..5d39a23f 100644
--- a/Dashboard/AddServerDialog.xaml
+++ b/Dashboard/AddServerDialog.xaml
@@ -51,29 +51,40 @@
                 <!-- Authentication Type -->
                 <TextBlock Text="Authentication:" FontWeight="Bold" Margin="0,0,0,5"
                            Foreground="{DynamicResource ForegroundBrush}"/>
-                <StackPanel Orientation="Horizontal" Margin="0,0,0,15">
+                <StackPanel Margin="0,0,0,15">
                     <RadioButton x:Name="WindowsAuthRadio" Content="Windows Authentication"
                                  GroupName="Auth" IsChecked="True"
                                  Foreground="{DynamicResource ForegroundBrush}"
-                                 Checked="AuthType_Changed" Margin="0,0,20,0"/>
+                                 Checked="AuthType_Changed" Margin="0,0,0,4"/>
                     <RadioButton x:Name="SqlAuthRadio" Content="SQL Server Authentication"
                                  GroupName="Auth"
                                  Foreground="{DynamicResource ForegroundBrush}"
-                                 Checked="AuthType_Changed"/>
+                                 Checked="AuthType_Changed" Margin="0,0,0,4"/>
+                    <RadioButton x:Name="EntraMfaAuthRadio" Content="Microsoft Entra MFA"
+                                 GroupName="Auth"
+                                 Foreground="{DynamicResource ForegroundBrush}"
+                                 Checked="AuthType_Changed"
+                                 ToolTip="Interactive authentication with MFA for Azure SQL Database."/>
                 </StackPanel>
 
-                <!-- SQL Authentication Fields (initially disabled) -->
-                <Border x:Name="SqlAuthPanel" IsEnabled="False">
-                    <StackPanel>
-                        <TextBlock Text="Username:" FontWeight="Bold" Margin="0,0,0,5"
-                                   Foreground="{DynamicResource ForegroundBrush}"/>
-                        <TextBox x:Name="UsernameTextBox" Height="25" Margin="0,0,0,15"/>
+                <!-- SQL Authentication Fields -->
+                <StackPanel x:Name="SqlAuthPanel" Visibility="Collapsed" Margin="0,0,0,15">
+                    <TextBlock Text="Username:" FontWeight="Bold" Margin="0,0,0,5"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                    <TextBox x:Name="UsernameTextBox" Height="25" Margin="0,0,0,15"/>
 
-                        <TextBlock Text="Password:" FontWeight="Bold" Margin="0,0,0,5"
-                                   Foreground="{DynamicResource ForegroundBrush}"/>
-                        <PasswordBox x:Name="PasswordBox" Height="25" Margin="0,0,0,15"/>
-                    </StackPanel>
-                </Border>
+                    <TextBlock Text="Password:" FontWeight="Bold" Margin="0,0,0,5"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                    <PasswordBox x:Name="PasswordBox" Height="25" Margin="0,0,0,0"/>
+                </StackPanel>
+
+                <!-- Microsoft Entra MFA Fields -->
+                <StackPanel x:Name="EntraMfaPanel" Visibility="Collapsed" Margin="0,0,0,15">
+                    <TextBlock Text="Username (optional):" FontWeight="Bold" Margin="0,0,0,5"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                    <TextBox x:Name="EntraMfaUsernameBox" Height="25" Margin="0,0,0,0"
+                             ToolTip="Optional: Pre-populate the authentication dialog with this email address"/>
+                </StackPanel>
 
                 <!-- Description -->
                 <TextBlock Text="Description (optional):" FontWeight="Bold" Margin="0,0,0,5"
diff --git a/Dashboard/AddServerDialog.xaml.cs b/Dashboard/AddServerDialog.xaml.cs
index dce20828..f4ad1a30 100644
--- a/Dashboard/AddServerDialog.xaml.cs
+++ b/Dashboard/AddServerDialog.xaml.cs
@@ -10,6 +10,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using Microsoft.Data.SqlClient;
+using PerformanceMonitorDashboard.Helpers;
 using PerformanceMonitorDashboard.Models;
 using PerformanceMonitorDashboard.Services;
 
@@ -51,11 +52,18 @@ public AddServerDialog(ServerConnection existingServer)
             };
             TrustServerCertificateCheckBox.IsChecked = existingServer.TrustServerCertificate;
 
-            if (existingServer.UseWindowsAuth)
+            if (existingServer.AuthenticationType == AuthenticationTypes.EntraMFA)
             {
-                WindowsAuthRadio.IsChecked = true;
+                EntraMfaAuthRadio.IsChecked = true;
+
+                var credentialService = new CredentialService();
+                var cred = credentialService.GetCredential(existingServer.Id);
+                if (cred.HasValue && !string.IsNullOrEmpty(cred.Value.Username))
+                {
+                    EntraMfaUsernameBox.Text = cred.Value.Username;
+                }
             }
-            else
+            else if (existingServer.AuthenticationType == AuthenticationTypes.SqlServer)
             {
                 SqlAuthRadio.IsChecked = true;
 
@@ -67,13 +75,23 @@ public AddServerDialog(ServerConnection existingServer)
                     PasswordBox.Password = cred.Value.Password;
                 }
             }
+            else
+            {
+                WindowsAuthRadio.IsChecked = true;
+            }
         }
 
         private void AuthType_Changed(object sender, RoutedEventArgs e)
         {
-            if (SqlAuthPanel != null)
+            if (SqlAuthPanel != null && EntraMfaPanel != null)
             {
-                SqlAuthPanel.IsEnabled = SqlAuthRadio.IsChecked == true;
+                SqlAuthPanel.Visibility = SqlAuthRadio.IsChecked == true
+                    ? System.Windows.Visibility.Visible
+                    : System.Windows.Visibility.Collapsed;
+
+                EntraMfaPanel.Visibility = EntraMfaAuthRadio.IsChecked == true
+                    ? System.Windows.Visibility.Visible
+                    : System.Windows.Visibility.Collapsed;
             }
         }
 
@@ -106,15 +124,27 @@ private SqlConnectionStringBuilder BuildConnectionBuilder()
                 ApplicationName = "PerformanceMonitorDashboard",
                 ConnectTimeout = 10,
                 TrustServerCertificate = TrustServerCertificateCheckBox.IsChecked == true,
-                Encrypt = ParseEncryptOption(GetSelectedEncryptMode()),
-                IntegratedSecurity = WindowsAuthRadio.IsChecked == true
+                Encrypt = ParseEncryptOption(GetSelectedEncryptMode())
             };
 
-            if (WindowsAuthRadio.IsChecked != true)
+            if (WindowsAuthRadio.IsChecked == true)
+            {
+                builder.IntegratedSecurity = true;
+            }
+            else if (SqlAuthRadio.IsChecked == true)
             {
+                builder.IntegratedSecurity = false;
                 builder.UserID = UsernameTextBox.Text.Trim();
                 builder.Password = PasswordBox.Password;
             }
+            else if (EntraMfaAuthRadio.IsChecked == true)
+            {
+                builder.IntegratedSecurity = false;
+                builder.Authentication = SqlAuthenticationMethod.ActiveDirectoryInteractive;
+                var mfaUsername = EntraMfaUsernameBox.Text.Trim();
+                if (!string.IsNullOrEmpty(mfaUsername))
+                    builder.UserID = mfaUsername;
+            }
 
             return builder;
         }
@@ -146,15 +176,19 @@ private bool ValidateInputs()
             return true;
         }
 
-        private async System.Threading.Tasks.Task<(bool Connected, string? ErrorMessage, string? ServerVersion)> RunConnectionTestAsync(Button triggerButton)
+        private async System.Threading.Tasks.Task<(bool Connected, string? ErrorMessage, bool MfaCancelled, string? ServerVersion)> RunConnectionTestAsync(Button triggerButton)
         {
             triggerButton.IsEnabled = false;
             SaveButton.IsEnabled = false;
-            StatusText.Text = "Testing connection...";
+
+            StatusText.Text = EntraMfaAuthRadio.IsChecked == true
+                ? "Testing connection — please complete authentication in the popup window..."
+                : "Testing connection...";
             StatusText.Visibility = System.Windows.Visibility.Visible;
 
             bool connected = false;
             string? errorMessage = null;
+            bool mfaCancelled = false;
             string? serverVersion = null;
             try
             {
@@ -169,6 +203,8 @@ private bool ValidateInputs()
             {
                 connected = false;
                 errorMessage = ex.Message;
+                if (EntraMfaAuthRadio.IsChecked == true && MfaAuthenticationHelper.IsMfaCancelledException(ex))
+                    mfaCancelled = true;
             }
             finally
             {
@@ -178,14 +214,14 @@ private bool ValidateInputs()
                 StatusText.Visibility = System.Windows.Visibility.Collapsed;
             }
 
-            return (connected, errorMessage, serverVersion);
+            return (connected, errorMessage, mfaCancelled, serverVersion);
         }
 
         private async void TestConnection_Click(object sender, RoutedEventArgs e)
         {
             if (!ValidateInputs()) return;
 
-            var (connected, errorMessage, serverVersion) = await RunConnectionTestAsync(TestConnectionButton);
+            var (connected, errorMessage, mfaCancelled, serverVersion) = await RunConnectionTestAsync(TestConnectionButton);
 
             if (connected)
             {
@@ -199,12 +235,26 @@ private async void TestConnection_Click(object sender, RoutedEventArgs e)
                     MessageBoxImage.Information
                 );
             }
+            else if (mfaCancelled)
+            {
+                MessageBox.Show(
+                    "Authentication was cancelled. Click Test to try again.",
+                    "Authentication Cancelled",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Warning
+                );
+            }
             else
             {
                 var detail = errorMessage != null ? $"\n\nError: {errorMessage}" : string.Empty;
                 MessageBox.Show(
-                    $"Could not connect to {ServerNameTextBox.Text}.{detail}",
-                    "Connection Failed",
+                    $"Could not connect to {ServerNameTextBox.Text}.{detail}\n\nPlease check:\n" +
+                    "• Server name/address is correct\n" +
+                    "• Server is accessible from this machine\n" +
+                    "• Firewall allows SQL Server connections\n" +
+                    "• SQL Server service is running\n" +
+                    "• You have the 'PerformanceMonitor' database and access to it",
+                    "Connection Test Failed",
                     MessageBoxButton.OK,
                     MessageBoxImage.Error
                 );
@@ -215,10 +265,21 @@ private async void Save_Click(object sender, RoutedEventArgs e)
         {
             if (!ValidateInputs()) return;
 
-            var (connected, errorMessage, _) = await RunConnectionTestAsync(SaveButton);
+            var (connected, errorMessage, mfaCancelled, _) = await RunConnectionTestAsync(SaveButton);
 
             if (!connected)
             {
+                if (mfaCancelled)
+                {
+                    MessageBox.Show(
+                        "Authentication was cancelled. Click Save to try again, or Cancel to abort.",
+                        "Authentication Cancelled",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Warning
+                    );
+                    return;
+                }
+
                 var detail = errorMessage != null ? $"\n\nError: {errorMessage}" : string.Empty;
                 var result = MessageBox.Show(
                     $"Could not connect to {ServerNameTextBox.Text}.{detail}\n\n" +
@@ -232,6 +293,27 @@ private async void Save_Click(object sender, RoutedEventArgs e)
                     return;
             }
 
+            // Determine authentication type and credentials
+            string authenticationType;
+            if (WindowsAuthRadio.IsChecked == true)
+            {
+                authenticationType = AuthenticationTypes.Windows;
+                Username = null;
+                Password = null;
+            }
+            else if (EntraMfaAuthRadio.IsChecked == true)
+            {
+                authenticationType = AuthenticationTypes.EntraMFA;
+                Username = EntraMfaUsernameBox.Text.Trim();
+                Password = null;
+            }
+            else
+            {
+                authenticationType = AuthenticationTypes.SqlServer;
+                Username = UsernameTextBox.Text.Trim();
+                Password = PasswordBox.Password;
+            }
+
             // Use server name as display name if not provided
             var displayName = string.IsNullOrWhiteSpace(DisplayNameTextBox.Text)
                 ? ServerNameTextBox.Text.Trim()
@@ -241,7 +323,7 @@ private async void Save_Click(object sender, RoutedEventArgs e)
             {
                 ServerConnection.DisplayName = displayName;
                 ServerConnection.ServerName = ServerNameTextBox.Text.Trim();
-                ServerConnection.UseWindowsAuth = WindowsAuthRadio.IsChecked == true;
+                ServerConnection.AuthenticationType = authenticationType;
                 ServerConnection.Description = DescriptionTextBox.Text.Trim();
                 ServerConnection.IsFavorite = IsFavoriteCheckBox.IsChecked == true;
                 ServerConnection.EncryptMode = GetSelectedEncryptMode();
@@ -253,7 +335,7 @@ private async void Save_Click(object sender, RoutedEventArgs e)
                 {
                     DisplayName = displayName,
                     ServerName = ServerNameTextBox.Text.Trim(),
-                    UseWindowsAuth = WindowsAuthRadio.IsChecked == true,
+                    AuthenticationType = authenticationType,
                     Description = DescriptionTextBox.Text.Trim(),
                     IsFavorite = IsFavoriteCheckBox.IsChecked == true,
                     CreatedDate = DateTime.Now,
@@ -263,12 +345,6 @@ private async void Save_Click(object sender, RoutedEventArgs e)
                 };
             }
 
-            if (SqlAuthRadio.IsChecked == true)
-            {
-                Username = UsernameTextBox.Text.Trim();
-                Password = PasswordBox.Password;
-            }
-
             DialogResult = true;
             Close();
         }
diff --git a/Dashboard/Helpers/MfaAuthenticationHelper.cs b/Dashboard/Helpers/MfaAuthenticationHelper.cs
new file mode 100644
index 00000000..3f4b1efe
--- /dev/null
+++ b/Dashboard/Helpers/MfaAuthenticationHelper.cs
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+
+namespace PerformanceMonitorDashboard.Helpers
+{
+    /// <summary>
+    /// Helper utilities for Microsoft Entra MFA authentication.
+    /// </summary>
+    public static class MfaAuthenticationHelper
+    {
+        /// <summary>
+        /// Checks if an exception indicates that the user cancelled MFA authentication.
+        /// </summary>
+        /// <param name="ex">The exception to check.</param>
+        /// <returns>True if the exception represents user cancellation, false otherwise.</returns>
+        public static bool IsMfaCancelledException(Exception ex)
+        {
+            var message = ex.Message?.ToLowerInvariant() ?? string.Empty;
+
+            // Only treat explicit user cancellation messages as cancellation
+            // Do NOT treat authentication errors (wrong password, account selection, etc.) as cancellation
+            return message.Contains("user canceled") ||
+                   message.Contains("user cancelled") ||
+                   message.Contains("authentication was cancelled") ||
+                   message.Contains("authentication was canceled");
+        }
+    }
+}
diff --git a/Dashboard/Interfaces/IServerManager.cs b/Dashboard/Interfaces/IServerManager.cs
index c305ca8f..6e98649f 100644
--- a/Dashboard/Interfaces/IServerManager.cs
+++ b/Dashboard/Interfaces/IServerManager.cs
@@ -55,7 +55,7 @@ public interface IServerManager
         /// <summary>
         /// Tests connectivity to a single server and updates its status.
         /// </summary>
-        Task<ServerConnectionStatus> CheckConnectionAsync(string serverId);
+        Task<ServerConnectionStatus> CheckConnectionAsync(string serverId, bool allowInteractiveAuth = false);
 
         /// <summary>
         /// Tests connectivity to all servers and updates their statuses.
diff --git a/Dashboard/MainWindow.xaml.cs b/Dashboard/MainWindow.xaml.cs
index 494b5c38..0908b527 100644
--- a/Dashboard/MainWindow.xaml.cs
+++ b/Dashboard/MainWindow.xaml.cs
@@ -711,7 +711,7 @@ private void AddServer_Click(object sender, RoutedEventArgs e)
 
                     MessageBox.Show(
                         $"Server '{server.DisplayName}' added successfully!\n\n" +
-                        (server.UseWindowsAuth ? "Using Windows Authentication" : "Credentials saved securely to Windows Credential Manager"),
+                        (server.AuthenticationType == Models.AuthenticationTypes.Windows ? "Using Windows Authentication" : $"Using {server.AuthenticationDisplay} — credentials saved securely to Windows Credential Manager"),
                         "Server Added",
                         MessageBoxButton.OK,
                         MessageBoxImage.Information
@@ -757,7 +757,7 @@ private void EditServer_Click(object sender, RoutedEventArgs e)
 
                         MessageBox.Show(
                             $"Server '{updatedServer.DisplayName}' updated successfully!\n\n" +
-                            (updatedServer.UseWindowsAuth ? "Using Windows Authentication" : "Credentials updated securely in Windows Credential Manager"),
+                            (updatedServer.AuthenticationType == Models.AuthenticationTypes.Windows ? "Using Windows Authentication" : $"Using {updatedServer.AuthenticationDisplay} — credentials updated securely in Windows Credential Manager"),
                             "Server Updated",
                             MessageBoxButton.OK,
                             MessageBoxImage.Information
diff --git a/Dashboard/Models/AuthenticationTypes.cs b/Dashboard/Models/AuthenticationTypes.cs
new file mode 100644
index 00000000..37767bf0
--- /dev/null
+++ b/Dashboard/Models/AuthenticationTypes.cs
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+namespace PerformanceMonitorDashboard.Models
+{
+    /// <summary>
+    /// Constants for server authentication types.
+    /// </summary>
+    public static class AuthenticationTypes
+    {
+        /// <summary>
+        /// Windows integrated authentication.
+        /// </summary>
+        public const string Windows = "Windows";
+
+        /// <summary>
+        /// SQL Server username/password authentication.
+        /// </summary>
+        public const string SqlServer = "SqlServer";
+
+        /// <summary>
+        /// Microsoft Entra MFA (Azure AD) interactive authentication.
+        /// </summary>
+        public const string EntraMFA = "EntraMFA";
+    }
+}
diff --git a/Dashboard/Models/ServerConnection.cs b/Dashboard/Models/ServerConnection.cs
index 701f1de5..3ef8dce6 100644
--- a/Dashboard/Models/ServerConnection.cs
+++ b/Dashboard/Models/ServerConnection.cs
@@ -8,6 +8,7 @@
 
 using System;
 using System.Text.Json.Serialization;
+using Microsoft.Data.SqlClient;
 using PerformanceMonitorDashboard.Interfaces;
 using PerformanceMonitorDashboard.Services;
 
@@ -18,7 +19,32 @@ public class ServerConnection
         public string Id { get; set; } = Guid.NewGuid().ToString();
         public string ServerName { get; set; } = string.Empty;
         public string DisplayName { get; set; } = string.Empty;
-        public bool UseWindowsAuth { get; set; } = true;
+
+        /// <summary>
+        /// Backward compatibility property for old servers.json files.
+        /// Returns true if authentication type is Windows.
+        /// Setter updates AuthenticationType for migration from old configs.
+        /// </summary>
+        public bool UseWindowsAuth
+        {
+            get => AuthenticationType == AuthenticationTypes.Windows;
+            set
+            {
+                // During JSON deserialization of old configs, update AuthenticationType based on UseWindowsAuth
+                // Only apply this if AuthenticationType is still at default (indicating old JSON without that field)
+                if (AuthenticationType == AuthenticationTypes.Windows && !value)
+                {
+                    // Old config with UseWindowsAuth=false -> SQL Server auth
+                    AuthenticationType = AuthenticationTypes.SqlServer;
+                }
+                // If value is true, keep Windows (already the default)
+            }
+        }
+
+        /// <summary>
+        /// Authentication type: Windows, SqlServer, or EntraMFA.
+        /// </summary>
+        public string AuthenticationType { get; set; } = AuthenticationTypes.Windows;
         public string? Description { get; set; }
         public DateTime CreatedDate { get; set; } = DateTime.Now;
         public DateTime LastConnected { get; set; } = DateTime.Now;
@@ -40,7 +66,12 @@ public class ServerConnection
         /// Display-only property for showing authentication type in UI.
         /// </summary>
         [JsonIgnore]
-        public string AuthenticationDisplay => UseWindowsAuth ? "Windows" : "SQL Server";
+        public string AuthenticationDisplay => AuthenticationType switch
+        {
+            AuthenticationTypes.EntraMFA => "Microsoft Entra MFA",
+            AuthenticationTypes.SqlServer => "SQL Server",
+            _ => "Windows"
+        };
 
         /// <summary>
         /// SECURITY: Credentials are NEVER serialized to JSON.
@@ -51,10 +82,38 @@ public class ServerConnection
         /// <returns>Connection string for SQL Server</returns>
         public string GetConnectionString(ICredentialService credentialService)
         {
+            if (AuthenticationType == AuthenticationTypes.EntraMFA)
+            {
+                // Build MFA connection string with ActiveDirectoryInteractive
+                var mfaBuilder = new SqlConnectionStringBuilder
+                {
+                    DataSource = ServerName,
+                    InitialCatalog = "PerformanceMonitor",
+                    ApplicationName = "PerformanceMonitorDashboard",
+                    ConnectTimeout = 15,
+                    MultipleActiveResultSets = true,
+                    TrustServerCertificate = TrustServerCertificate,
+                    Encrypt = EncryptMode switch
+                    {
+                        "Optional" => SqlConnectionEncryptOption.Optional,
+                        "Strict" => SqlConnectionEncryptOption.Strict,
+                        _ => SqlConnectionEncryptOption.Mandatory
+                    },
+                    Authentication = SqlAuthenticationMethod.ActiveDirectoryInteractive
+                };
+
+                // Optionally pre-populate username from credential store
+                var mfaCred = credentialService.GetCredential(Id);
+                if (mfaCred.HasValue && !string.IsNullOrEmpty(mfaCred.Value.Username))
+                    mfaBuilder.UserID = mfaCred.Value.Username;
+
+                return mfaBuilder.ConnectionString;
+            }
+
             string? username = null;
             string? password = null;
 
-            if (!UseWindowsAuth)
+            if (AuthenticationType == AuthenticationTypes.SqlServer)
             {
                 var cred = credentialService.GetCredential(Id);
                 if (cred.HasValue)
@@ -79,10 +138,10 @@ public string GetConnectionString(ICredentialService credentialService)
         /// Used to validate that SQL auth servers have credentials available.
         /// </summary>
         /// <param name="credentialService">The credential service to use for checking credentials</param>
-        /// <returns>True if Windows auth is used or if credentials exist in credential manager</returns>
+        /// <returns>True if Windows auth or MFA is used, or if credentials exist in credential manager</returns>
         public bool HasStoredCredentials(ICredentialService credentialService)
         {
-            if (UseWindowsAuth)
+            if (AuthenticationType == AuthenticationTypes.Windows || AuthenticationType == AuthenticationTypes.EntraMFA)
             {
                 return true;
             }
diff --git a/Dashboard/Models/ServerConnectionStatus.cs b/Dashboard/Models/ServerConnectionStatus.cs
index 5000dd14..ac102bb7 100644
--- a/Dashboard/Models/ServerConnectionStatus.cs
+++ b/Dashboard/Models/ServerConnectionStatus.cs
@@ -68,6 +68,12 @@ public class ServerConnectionStatus
         /// </summary>
         public bool IsAwsRds { get; set; }
 
+        /// <summary>
+        /// Whether the user cancelled MFA authentication for this server.
+        /// When true, background connectivity checks are skipped to avoid repeated authentication popups.
+        /// </summary>
+        public bool UserCancelledMfa { get; set; }
+
         /// <summary>
         /// The server's UTC offset in minutes, queried via DATEDIFF(MINUTE, GETUTCDATE(), GETDATE()).
         /// Used to convert UTC-stored collection_time values to server-local time for display.
diff --git a/Dashboard/Services/ServerManager.cs b/Dashboard/Services/ServerManager.cs
index cf9099dd..f0a1d667 100644
--- a/Dashboard/Services/ServerManager.cs
+++ b/Dashboard/Services/ServerManager.cs
@@ -82,13 +82,22 @@ public void AddServer(ServerConnection server, string? username = null, string?
                 SaveServersInternal();
             }
 
-            if (!server.UseWindowsAuth && !string.IsNullOrEmpty(username) && password != null)
+            if (server.AuthenticationType == AuthenticationTypes.SqlServer && !string.IsNullOrEmpty(username) && password != null)
             {
+                // For SQL Server auth, save both username and password
                 if (!_credentialService.SaveCredential(server.Id, username, password))
                 {
                     throw new InvalidOperationException("Failed to save credentials to Windows Credential Manager");
                 }
             }
+            else if (server.AuthenticationType == AuthenticationTypes.EntraMFA && !string.IsNullOrEmpty(username))
+            {
+                // For MFA auth, save username hint only (no password needed)
+                if (!_credentialService.SaveCredential(server.Id, username, string.Empty))
+                {
+                    throw new InvalidOperationException("Failed to save username to Windows Credential Manager");
+                }
+            }
 
             // Initialize status as unknown for new server
             _connectionStatuses[server.Id] = new ServerConnectionStatus { ServerId = server.Id };
@@ -109,15 +118,25 @@ public void UpdateServer(ServerConnection server, string? username = null, strin
                 SaveServersInternal();
             }
 
-            if (!server.UseWindowsAuth && !string.IsNullOrEmpty(username) && password != null)
+            if (server.AuthenticationType == AuthenticationTypes.SqlServer && !string.IsNullOrEmpty(username) && password != null)
             {
+                // For SQL Server auth, update both username and password
                 if (!_credentialService.UpdateCredential(server.Id, username, password))
                 {
                     throw new InvalidOperationException("Failed to update credentials in Windows Credential Manager");
                 }
             }
-            else if (server.UseWindowsAuth)
+            else if (server.AuthenticationType == AuthenticationTypes.EntraMFA && !string.IsNullOrEmpty(username))
+            {
+                // For MFA auth, update username hint only (no password needed)
+                if (!_credentialService.UpdateCredential(server.Id, username, string.Empty))
+                {
+                    throw new InvalidOperationException("Failed to update username in Windows Credential Manager");
+                }
+            }
+            else if (server.AuthenticationType == AuthenticationTypes.Windows)
             {
+                // For Windows auth, remove any stored credentials
                 _credentialService.DeleteCredential(server.Id);
             }
         }
@@ -191,7 +210,7 @@ public ServerConnectionStatus GetConnectionStatus(string serverId)
             return newStatus;
         }
 
-        public async Task<ServerConnectionStatus> CheckConnectionAsync(string serverId)
+        public async Task<ServerConnectionStatus> CheckConnectionAsync(string serverId, bool allowInteractiveAuth = false)
         {
             var server = GetServerById(serverId);
             if (server == null)
@@ -209,6 +228,25 @@ public async Task<ServerConnectionStatus> CheckConnectionAsync(string serverId)
             // Get previous status to detect status changes
             var previousStatus = GetConnectionStatus(serverId);
 
+            // Skip interactive authentication methods during background checks
+            if (!allowInteractiveAuth && server.AuthenticationType == AuthenticationTypes.EntraMFA)
+            {
+                var errorMsg = previousStatus.UserCancelledMfa
+                    ? "Authentication cancelled by user"
+                    : "Skipped — requires interactive authentication";
+
+                return new ServerConnectionStatus
+                {
+                    ServerId = serverId,
+                    IsOnline = previousStatus.UserCancelledMfa ? false : previousStatus.IsOnline,
+                    LastChecked = DateTime.Now,
+                    StatusChangedAt = previousStatus.StatusChangedAt,
+                    ErrorMessage = errorMsg,
+                    PreviousIsOnline = previousStatus.IsOnline,
+                    UserCancelledMfa = previousStatus.UserCancelledMfa
+                };
+            }
+
             var status = new ServerConnectionStatus
             {
                 ServerId = serverId,
@@ -273,19 +311,40 @@ CASE WHEN DB_ID('rdsadmin') IS NOT NULL THEN 1 ELSE 0 END AS is_aws_rds
                 else
                 {
                     Logger.Info($"Connectivity check passed for server '{server.DisplayName}'");
+                    status.UserCancelledMfa = false; // Clear any previous cancellation flag
                 }
             }
             catch (SqlException ex)
             {
                 status.IsOnline = false;
                 status.ErrorMessage = ex.Message;
-                Logger.Warning($"Connectivity check failed for server '{server.DisplayName}': {ex.Message}");
+
+                if (server.AuthenticationType == AuthenticationTypes.EntraMFA && MfaAuthenticationHelper.IsMfaCancelledException(ex))
+                {
+                    status.UserCancelledMfa = true;
+                    status.ErrorMessage = "Authentication cancelled by user";
+                    Logger.Info($"MFA authentication cancelled by user for server '{server.DisplayName}'");
+                }
+                else
+                {
+                    Logger.Warning($"Connectivity check failed for server '{server.DisplayName}': {ex.Message}");
+                }
             }
             catch (Exception ex)
             {
                 status.IsOnline = false;
                 status.ErrorMessage = ex.Message;
-                Logger.Warning($"Connectivity check error for server '{server.DisplayName}': {ex.Message}");
+
+                if (server.AuthenticationType == AuthenticationTypes.EntraMFA && MfaAuthenticationHelper.IsMfaCancelledException(ex))
+                {
+                    status.UserCancelledMfa = true;
+                    status.ErrorMessage = "Authentication cancelled by user";
+                    Logger.Info($"MFA authentication cancelled by user for server '{server.DisplayName}'");
+                }
+                else
+                {
+                    Logger.Warning($"Connectivity check error for server '{server.DisplayName}': {ex.Message}");
+                }
             }
 
             // Track when status changed (online to offline or vice versa)