diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs
index d62fe2d2..1c5dbeaa 100644
--- a/DesktopEdge/MainWindow.xaml.cs
+++ b/DesktopEdge/MainWindow.xaml.cs
@@ -894,6 +894,8 @@ namespace ZitiDesktopEdge {
 					foreach (var id in ids) {
 						IdentityItem idItem = new IdentityItem();
 
+						// Clint - I am going to put this back in until the MFA info is set before the ui load
+						if (id.IsMFAEnabled && id.Services.Count > 0) id.MFAInfo.IsAuthenticated = true;
 						idItem.ToggleStatus.IsEnabled = id.IsEnabled;
 						if (id.IsEnabled) {
 							idItem.ToggleStatus.Content = "ENABLED";
diff --git a/DesktopEdge/Views/Screens/MFAScreen.xaml.cs b/DesktopEdge/Views/Screens/MFAScreen.xaml.cs
index 5201d7db..ce91bf9e 100644
--- a/DesktopEdge/Views/Screens/MFAScreen.xaml.cs
+++ b/DesktopEdge/Views/Screens/MFAScreen.xaml.cs
@@ -229,6 +229,8 @@ namespace ZitiDesktopEdge {
 						this.OnError?.Invoke("Authentication Failed");
 						this._executing = false;
 					} else {
+						MfaRecoveryCodesResponse codeResponse = await serviceClient.ReturnMFACodes(this._identity.Fingerprint, code);
+						this._identity.MFAInfo.RecoveryCodes = codeResponse.Payload;
 						this._identity.MFAInfo.IsAuthenticated = true;
 						this.OnClose?.Invoke(true);
 						this._executing = false;