1 files changed, 5 insertions, 4 deletions
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 b08c259af..ceb81a66f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -7,6 +7,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
+using Tango.Integration.Services;
 using Tango.Logging;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Authentication;
@@ -152,17 +153,17 @@ namespace Tango.MachineStudio.UI.ViewModels
                         }
                     }
 
-                    if (x.SelectedMachine.Type != Integration.Services.ExternalBridgeClientType.USB)
+                    if (x.SelectedMachine.RequiresAuthentication)
                     {
                         _notificationProvider.ShowModalDialog<MachineLoginViewVM>(async (login) =>
                         {
-                            using (NotificationProvider.PushTaskItem("Connecting to machine " + x.SelectedMachine.SerialNumber + "..."))
+                            using (NotificationProvider.PushTaskItem("Connecting to machine " + x.SelectedMachine.ToString() + "..."))
                             {
                                 try
                                 {
                                     await x.SelectedMachine.Connect();
 
-                                    var authenticated = await x.SelectedMachine.Authenticate(login.Password);
+                                    var authenticated = await x.SelectedMachine.As<IExternalBridgeSecureClient>().Authenticate(login.Password);
                                     if (!authenticated)
                                     {
                                         _notificationProvider.ShowError("It seems like you are not authorized to access the selected machine.");
@@ -184,7 +185,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                     }
                     else
                     {
-                        using (NotificationProvider.PushTaskItem("Connecting to " + x.SelectedMachine.Device + "..."))
+                        using (NotificationProvider.PushTaskItem("Connecting to " + x.SelectedMachine.ToString() + "..."))
                         {
                             try
                             {