2 files changed, 7 insertions, 4 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs
index 81d3f4243..9dcf03d40 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
+using Tango.Integration.ExternalBridge;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.PMR.Integration;
 using Tango.SharedUI;
@@ -16,6 +17,8 @@ namespace Tango.MachineStudio.UI.ViewModels
     /// <seealso cref="Tango.MachineStudio.Common.Notifications.DialogViewVM" />
     public class MachineLoginViewVM : DialogViewVM
     {
+        public IExternalBridgeSecureClient ExternalBridgeClient { get; set; }
+
         /// <summary>
         /// Gets or sets the machine password.
         /// </summary>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 293cccec4..5ba726700 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -667,10 +667,10 @@ namespace Tango.MachineStudio.UI.ViewModels
                 return;
             }
 
-            _notificationProvider.ShowModalDialog<MachineLoginViewVM>((login) =>
-            {
-                ConnectToMachineSecure(machine, login);
-            });
+            _notificationProvider.ShowModalDialog<MachineLoginViewVM, Views.MachineLoginView>(new MachineLoginViewVM() { ExternalBridgeClient = machine }, (login) =>
+               {
+                   ConnectToMachineSecure(machine, login);
+               }, () => { });
         }
 
         private void Machine_SessionClosed(object sender, EventArgs e)