Index: AAPClient/UI/LoginScherm2.pas
===================================================================
diff -u -r148 -r150
--- AAPClient/UI/LoginScherm2.pas	(.../LoginScherm2.pas)	(revision 148)
+++ AAPClient/UI/LoginScherm2.pas	(.../LoginScherm2.pas)	(revision 150)
@@ -54,7 +54,7 @@
     Request.Initialen := edtInitialen.Text;
     Request.LoginCode := edtPinCode.Text;
     Header.Initialen := edtInitialen.Text;
-    Header.ComputerNaam := ComputerName()+' / '+WUserName();
+    Header.ComputerNaam := FullName();
     Request.Header := Header;
 
     Response := Service.GebruikerAanmelden(Request);
Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r147 -r150
--- AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 147)
+++ AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 150)
@@ -139,7 +139,7 @@
   Header := RequestHeader.Create;
   try
     Header.Initialen := UiContext.Initialen;
-    Header.ComputerNaam := ComputerName();
+    Header.ComputerNaam := FullName();
     Request.Header := Header;
     Request.DnaCode := edtDnaCode.Text;
     Request.Aantal := 1;
@@ -184,7 +184,7 @@
   Header := RequestHeader.Create;
   try
     Header.Initialen := UiContext.Initialen;
-    Header.ComputerNaam := ComputerName();
+    Header.ComputerNaam := FullName();
     Request.Header := Header;
     Request.Toelevering := UiContext.Toelevering;
 
@@ -225,7 +225,7 @@
   Header := RequestHeader.Create;
   try
     Header.Initialen := UiContext.Initialen;
-    Header.ComputerNaam := ComputerName();
+    Header.ComputerNaam := FullName();
     Request.Header := Header;
     Request.Toelevering := UiContext.Toelevering;
     Request.Status := Status;
Index: AAPClient/UI/HernoemPalletScherm.pas
===================================================================
diff -u -r142 -r150
--- AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 142)
+++ AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 150)
@@ -108,7 +108,7 @@
   Header := RequestHeader.Create;
   try
     Header.Initialen := UiContext.Initialen;
-    Header.ComputerNaam := ComputerName();
+    Header.ComputerNaam := FullName();
     Request.Header := Header;
     Request.OudeCode := OudeCode;
     Request.OudeCode := NieuweCode;
Index: AAPClient/UI/InfoLogScherm.pas
===================================================================
diff -u -r142 -r150
--- AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 142)
+++ AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 150)
@@ -82,7 +82,7 @@
     Header := RequestHeader.Create;
     try
       Header.Initialen := lblGebruiker.Caption;
-      Header.ComputerNaam := ComputerName();
+      Header.ComputerNaam := FullName();
       Request.Header := Header;
       Request.DnaCode := sgToeleveringData.Rows[sgToeleveringData.Row][0];
       Request.Aantal := -1;
@@ -169,7 +169,7 @@
   Header := RequestHeader.Create;
   try
     Header.Initialen := UiContext.Initialen;
-    Header.ComputerNaam := ComputerName();
+    Header.ComputerNaam := FullName();
     Request.Header := Header;
     Request.Toelevering := UiContext.Toelevering;
 
Index: AAPClient/UI/PalletScherm.pas
===================================================================
diff -u -r138 -r150
--- AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 138)
+++ AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 150)
@@ -57,7 +57,7 @@
   Header := RequestHeader.Create;
   try
     Header.Initialen := UiContext.Initialen;
-    Header.ComputerNaam := ComputerName();
+    Header.ComputerNaam := FullName();
     fValideerPalletCodeRequest.Header := Header;
     fValideerPalletCodeRequest.PalletCode := edtPallet.Text;
 
@@ -84,7 +84,7 @@
     Header := RequestHeader.Create;
     try
       Header.Initialen := UiContext.Initialen;
-      Header.ComputerNaam := ComputerName();
+      Header.ComputerNaam := FullName();
       fZoekViaPalletCodeRequest.Header := Header;
       fZoekViaPalletCodeRequest.PalletCode := UiContext.Pallet;
 
@@ -93,9 +93,10 @@
         if fZoekViaPalletCodeResponse.Header.Status = '200' then begin
           UiContext.Toelevering := fZoekViaPalletCodeResponse.DnaCodes[0].Toelevering;
           Self.ModalResult := mrBestaandePallet;
-        end else
+        end else begin
           UiContext.Toelevering := '';
           Self.ModalResult := mrDnaCode;
+        end;
       finally
         fZoekViaPalletCodeResponse.Free;
       end;
Index: AAPClient/UI/HernoemPalletScherm.dfm
===================================================================
diff -u -r142 -r150
--- AAPClient/UI/HernoemPalletScherm.dfm	(.../HernoemPalletScherm.dfm)	(revision 142)
+++ AAPClient/UI/HernoemPalletScherm.dfm	(.../HernoemPalletScherm.dfm)	(revision 150)
@@ -1,4 +1,6 @@
 inherited fmHernoemPalletScherm: TfmHernoemPalletScherm
+  ExplicitWidth = 320
+  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 19
   inherited pnlDrieKnoppen: TPanel
@@ -41,6 +43,10 @@
     object tsOudeCode: TTabSheet
       Caption = 'tsOudeCode'
       TabVisible = False
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object lblOudeCode: TLabel
         Left = 3
         Top = 38
Index: AAPClient/UI/PalletScherm.dfm
===================================================================
diff -u -r124 -r150
--- AAPClient/UI/PalletScherm.dfm	(.../PalletScherm.dfm)	(revision 124)
+++ AAPClient/UI/PalletScherm.dfm	(.../PalletScherm.dfm)	(revision 150)
@@ -1,5 +1,7 @@
 inherited fmPalletScherm: TfmPalletScherm
   Caption = 'fmPalletScherm'
+  ExplicitWidth = 320
+  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 19
   object imgPallet: TImage [0]
Index: AAPClient/UI/DrieKnoppenScherm.pas
===================================================================
diff -u -r148 -r150
--- AAPClient/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 148)
+++ AAPClient/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 150)
@@ -42,11 +42,12 @@
     procedure imgCentraalOnderClick(Sender: TObject);
     procedure imgRechtsOnderClick(Sender: TObject);
   private
-    fImagesScherm: TImagesScherm;
     fUiContext: TUiContext;
   protected
+    fImagesScherm: TImagesScherm;
     function ComputerName: String;
     function WUserName: String;
+    function FullName: String;
     function ToonPopupScherm(Melding, Actie1: String; Actie2: String = ''; isVraag: boolean = false; ImageIndex1: integer = -1; ImageIndex2: integer = -1): TModalResult;
   public
     property UiContext: TUiContext Read fUiContext Write fUiContext;
@@ -99,6 +100,11 @@
   
 end;
 
+function TfmDrieKnoppenScherm.FullName: String;
+begin
+  Result := ComputerName + ' / ' + WUserName;
+end;
+
 procedure TfmDrieKnoppenScherm.imgLinksOnderClick(Sender: TObject);
 begin
   if btnLinksOnder.Action<>nil then begin