Index: AAPClient/UI/DrieKnoppenScherm.pas
===================================================================
diff -u -r24 -r26
--- AAPClient/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 24)
+++ AAPClient/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 26)
@@ -26,6 +26,8 @@
     procedure FormCreate(Sender: TObject);
   private
     fImagesScherm: TImagesScherm;
+  protected
+    function ComputerName: String;
   public
     { Public declarations }
   end;
@@ -72,4 +74,16 @@
   
 end;
 
+function TfmDrieKnoppenScherm.ComputerName: String;
+var
+  buffer: array[0..255] of char;
+  size: dword;
+begin
+  size := 256;
+  if GetComputerName(buffer, size) then
+    Result := buffer
+  else
+    Result := ''
+end;
+
 end.
Index: AAPClient/UI/LoginScherm.pas
===================================================================
diff -u -r25 -r26
--- AAPClient/UI/LoginScherm.pas	(.../LoginScherm.pas)	(revision 25)
+++ AAPClient/UI/LoginScherm.pas	(.../LoginScherm.pas)	(revision 26)
@@ -24,7 +24,6 @@
     procedure actVolgendeExecute(Sender: TObject);
   private
     procedure SetStatusButtonRechtsOnderaan;
-    function ComputerName: String;
   public
     function GeefInitialen: string;
     function GeefLoginCode: string;
@@ -69,16 +68,19 @@
   Service: GebruikerServiceSoap;
   Request: GebruikerAanmeldenRequest;
   Response: GebruikerAanmeldenResponse;
+  Header: RequestHeader;
   PopupScherm: TfmPopupScherm;
 begin
   Service := GebruikerService.GetGebruikerServiceSoap();
   // request opbouwen
   Request := GebruikerAanmeldenRequest.Create;
+  Header := RequestHeader.Create;
   try
     Request.Initialen := edtInitialen.Text;
     Request.LoginCode := edtPincode.Text;
-    Request.Header.Initialen := edtInitialen.Text;
-    Request.Header.ComputerNaam := ComputerName();
+    Header.Initialen := edtInitialen.Text;
+    Header.ComputerNaam := ComputerName();
+    Request.Header := Header;
 
     Response := Service.GebruikerAanmelden(Request);
     try
@@ -146,16 +148,4 @@
   btnRechtsOnder.Enabled := ((edtPincode.Text <> '') and (edtInitialen.Text <> ''));
 end;
 
-function TfmLoginScherm.ComputerName: String;
-var
-  buffer: array[0..255] of char;
-  size: dword;
-begin
-  size := 256;
-  if GetComputerName(buffer, size) then
-    Result := buffer
-  else
-    Result := ''
-end;
-
 end.