diff --git a/DDMonorepo.sln b/DDMonorepo.sln
index 6f94ebfd..84d2659d 100644
--- a/DDMonorepo.sln
+++ b/DDMonorepo.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2000
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29728.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}"
 EndProject
diff --git a/GUIs.ClientSuite/App.config b/GUIs.ClientSuite/App.config
index 3a3f427a..563695b9 100644
--- a/GUIs.ClientSuite/App.config
+++ b/GUIs.ClientSuite/App.config
@@ -30,7 +30,7 @@
   <applicationSettings>
     <DigitalData.GUIs.ClientSuite.My.MySettings>
       <setting name="IDBNetworkServiceAddress" serializeAs="String">
-        <value>net.tcp://172.24.12.67:9000/DigitalData/Services/Main</value>
+        <value>net.tcp://172.24.12.39:9000/DigitalData/Services/Main</value>
       </setting>
     </DigitalData.GUIs.ClientSuite.My.MySettings>
     <ClientSuite.My.MySettings>
diff --git a/GUIs.ClientSuite/ClassService.vb b/GUIs.ClientSuite/ClassService.vb
index f93921e8..3c35876b 100644
--- a/GUIs.ClientSuite/ClassService.vb
+++ b/GUIs.ClientSuite/ClassService.vb
@@ -1,8 +1,10 @@
 Imports System.ServiceModel
 Imports System.ServiceModel.Channels
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.EDMIAPI
 Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
 Imports DigitalData.GUIs.ClientSuite.Base
+Imports System.ServiceModel.Security
 
 Public Class ClassService
     Inherits BaseClass
@@ -11,6 +13,7 @@ Public Class ClassService
         Successful
         NotFound
         EmptyURI
+        Authentication
         Unknown
     End Enum
 
@@ -60,6 +63,9 @@ Public Class ClassService
                                                Catch ex As UriFormatException
                                                    Logger.Error(ex)
                                                    Return ConnectionTestResult.EmptyURI
+                                               Catch ex As SecurityNegotiationException
+                                                   Logger.Error(ex)
+                                                   Return ConnectionTestResult.Authentication
                                                Catch ex As Exception
                                                    Logger.Error(ex)
                                                    Return ConnectionTestResult.Unknown
@@ -93,5 +99,4 @@ Public Class ClassService
 
         Return oBinding
     End Function
-
 End Class
diff --git a/GUIs.ClientSuite/My Project/Settings.Designer.vb b/GUIs.ClientSuite/My Project/Settings.Designer.vb
index f955693d..e1bda371 100644
--- a/GUIs.ClientSuite/My Project/Settings.Designer.vb	
+++ b/GUIs.ClientSuite/My Project/Settings.Designer.vb	
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Public NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -56,7 +56,7 @@ Namespace My
         
         <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("net.tcp://172.24.12.67:9000/DigitalData/Services/Main")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("net.tcp://172.24.12.39:9000/DigitalData/Services/Main")>  _
         Public ReadOnly Property IDBNetworkServiceAddress() As String
             Get
                 Return CType(Me("IDBNetworkServiceAddress"),String)
diff --git a/GUIs.ClientSuite/My Project/Settings.settings b/GUIs.ClientSuite/My Project/Settings.settings
index c0bbbcba..b8867bbb 100644
--- a/GUIs.ClientSuite/My Project/Settings.settings	
+++ b/GUIs.ClientSuite/My Project/Settings.settings	
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="IDBNetworkServiceAddress" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">net.tcp://172.24.12.67:9000/DigitalData/Services/Main</Value>
+      <Value Profile="(Default)">net.tcp://172.24.12.39:9000/DigitalData/Services/Main</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/GUIs.ClientSuite/My Project/licenses.licx b/GUIs.ClientSuite/My Project/licenses.licx
index fb9c5d02..fff75b68 100644
--- a/GUIs.ClientSuite/My Project/licenses.licx	
+++ b/GUIs.ClientSuite/My Project/licenses.licx	
@@ -1,3 +1,10 @@
 DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/GUIs.ClientSuite/frmConfigService.vb b/GUIs.ClientSuite/frmConfigService.vb
index b7166cd5..91390aee 100644
--- a/GUIs.ClientSuite/frmConfigService.vb
+++ b/GUIs.ClientSuite/frmConfigService.vb
@@ -40,6 +40,8 @@ Public Class frmConfigService
                         lblStatus.Text = "Dienst konnte nicht gefunden werden. Bitte überprüfen sie Addresse und Port."
                     Case ClassService.ConnectionTestResult.EmptyURI
                         lblStatus.Text = "Bitte tragen Sie eine gültige Dienst Adresse ein."
+                    Case ClassService.ConnectionTestResult.Authentication
+                        lblStatus.Text = "Authentifizierungsfehler. Prüfen Sie, ob sich Ihr Gerät in der korrekten Domäne befindet."
                     Case Else
                         lblStatus.Text = "Unbekannter Fehler."
                 End Select