Index: ProScan/ProScanMain.pas
===================================================================
diff -u -r485 -r488
--- ProScan/ProScanMain.pas	(.../ProScanMain.pas)	(revision 485)
+++ ProScan/ProScanMain.pas	(.../ProScanMain.pas)	(revision 488)
@@ -56,16 +56,28 @@
 end;
 
 procedure TfmProScanHoofdscherm.VerwerkParamStrings;
+var
+  ParamTeller: integer;
 begin
-  if ParamStr(1)='displaymode=desktop' then begin
-    Self.BorderStyle := bsSingle;
-    Self.ClientHeight := 1000;//640;
-    Self.ClientWidth := 600;//480;
+  ParamTeller := 1;
+  while ParamTeller <= ParamCount do begin
+
+    if ParamStr(ParamTeller)='displaymode=desktop' then begin
+      Self.BorderStyle := bsSingle;
+      Self.ClientHeight := 640;
+      Self.ClientWidth := 480;
+    end;
+
+    if Copy(ParamStr(ParamTeller),1,Pos('=',ParamStr(ParamTeller))) = 'server=' then
+      UiContext.ServerName := Copy(ParamStr(ParamTeller),Pos('=',ParamStr(ParamTeller))+1,length(ParamStr(ParamTeller)));
+
+    ParamTeller := ParamTeller + 1;
+
   end;
-  if ParamStr(2) <> '' then
-    UiContext.ServerName := Copy(ParamStr(2),Pos('=',ParamStr(2))+1,length(ParamStr(2)))
-  else
+
+  if UiContext.ServerName = '' then
     UiContext.ServerName := 'tve-w10';
+
 end;
 
 procedure TfmProScanHoofdscherm.HuidigeGebruikerAfmelden;
@@ -110,3 +122,4 @@
 end;
 
 end.
+