Index: PlanScan/UI/UiContext.pas
===================================================================
diff -u -r259 -r298
--- PlanScan/UI/UiContext.pas	(.../UiContext.pas)	(revision 259)
+++ PlanScan/UI/UiContext.pas	(.../UiContext.pas)	(revision 298)
@@ -28,6 +28,7 @@
     fDesktopMode: boolean;
     fIsDirecteLeveringPopupGetoond: boolean;
     fIsWegwerpPalletPopupGetoond: boolean;
+    fServerName: string;
   public
     Property Initialen: String Read fInitialen Write fInitialen;
     Property LoginCode: String Read fLoginCode Write fLoginCode;
@@ -39,6 +40,7 @@
     Property DesktopMode: boolean Read fDesktopMode Write fDesktopMode;
     Property IsDirecteLeveringPopupGetoond: boolean Read fIsDirecteLeveringPopupGetoond Write fIsDirecteLeveringPopupGetoond;
     Property IsWegwerpPalletPopupGetoond: boolean Read fIsWegwerpPalletPopupGetoond Write fIsWegwerpPalletPopupGetoond;
+    Property ServerName: string Read fServerName Write fServerName;
   end;
 
 implementation
Index: PlanScan/WS/Agent.pas
===================================================================
diff -u -r297 -r298
--- PlanScan/WS/Agent.pas	(.../Agent.pas)	(revision 297)
+++ PlanScan/WS/Agent.pas	(.../Agent.pas)	(revision 298)
@@ -15,7 +15,7 @@
     function ComputerName: String;
     function WUserName: String;
   public
-    Constructor Create(UiContext: TUiContext; Server: string = 'tve-w10'); overload;
+    Constructor Create(UiContext: TUiContext); overload;
     function FullName: String;
     function GebruikerAanmelden(Initialen: string; LoginCode: string): GebruikerAanmeldenResponse;
     function GebruikerAfmelden(Initialen, LoginCode: string): boolean;
@@ -40,12 +40,12 @@
 
 { TAgent }
 
-constructor TAgent.Create(UiContext: TUiContext; Server: string = 'tve-w10');
+constructor TAgent.Create(UiContext: TUiContext);
 var
   fNamespace: string;
 begin
   fUiContext := UiContext;
-  fServer := Server;
+  fServer := UiContext.ServerName;
   fNameSpace := 'dev1';
   if fServer = 'cache01' then
     fNameSpace := 'admin1';