Index: AAPClient/UI/HernoemPalletScherm.dfm
===================================================================
diff -u -r153 -r154
--- AAPClient/UI/HernoemPalletScherm.dfm	(.../HernoemPalletScherm.dfm)	(revision 153)
+++ AAPClient/UI/HernoemPalletScherm.dfm	(.../HernoemPalletScherm.dfm)	(revision 154)
@@ -35,7 +35,7 @@
     Top = 57
     Width = 480
     Height = 451
-    ActivePage = tsResultaat
+    ActivePage = tsNieuweCode
     Align = alClient
     Style = tsFlatButtons
     TabOrder = 2
@@ -51,6 +51,7 @@
         Width = 446
         Height = 85
         Alignment = taCenter
+        AutoSize = False
         Caption = 'Scan oude pallet- of DNA-code'
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -73,6 +74,7 @@
         Font.Style = []
         ParentFont = False
         TabOrder = 0
+        OnKeyUp = edtOudeCodeKeyUp
       end
     end
     object tsResultaat: TTabSheet
@@ -154,6 +156,7 @@
         Width = 446
         Height = 85
         Alignment = taCenter
+        AutoSize = False
         Caption = 'Scan nieuwe pallet- of DNA-code'
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -176,6 +179,7 @@
         Font.Style = []
         ParentFont = False
         TabOrder = 0
+        OnKeyUp = edtNieuweCodeKeyUp
       end
     end
   end
Index: AAPClient/UI/HernoemPalletScherm.pas
===================================================================
diff -u -r153 -r154
--- AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 153)
+++ AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 154)
@@ -33,6 +33,10 @@
     procedure btnVorigeClick(Sender: TObject);
     procedure btnVolgendeClick(Sender: TObject);
     procedure btnLaatstClick(Sender: TObject);
+    procedure edtOudeCodeKeyUp(Sender: TObject; var Key: Word;
+      Shift: TShiftState);
+    procedure edtNieuweCodeKeyUp(Sender: TObject; var Key: Word;
+      Shift: TShiftState);
   private
     procedure VulGridMetToeleveringData(DnaCodes: array of DnaCode);
     procedure GridLeegmaken;
@@ -95,6 +99,26 @@
     sgToeleveringData.Row := sgToeleveringData.Row - 1;
 end;
 
+procedure TfmHernoemPalletScherm.edtNieuweCodeKeyUp(Sender: TObject;
+  var Key: Word; Shift: TShiftState);
+begin
+  inherited;
+  if Key = VK_RETURN then begin
+    actVolgende.Execute;
+    Key := 0;
+  end;
+end;
+
+procedure TfmHernoemPalletScherm.edtOudeCodeKeyUp(Sender: TObject;
+  var Key: Word; Shift: TShiftState);
+begin
+  inherited;
+  if Key = VK_RETURN then begin
+    actVolgende.Execute;
+    Key := 0;
+  end;
+end;
+
 function TfmHernoemPalletScherm.HernoemPallet(OudeCode, NieuweCode: string): HernoemPalletResponse;
 var
   Service: DnaCodeServiceSoap;
@@ -111,7 +135,7 @@
     Header.ComputerNaam := FullName();
     Request.Header := Header;
     Request.OudeCode := OudeCode;
-    Request.OudeCode := NieuweCode;
+    Request.NieuweCode := NieuweCode;
 
     Response := Service.HernoemPallet(Request);
     try
@@ -138,9 +162,9 @@
 
 procedure TfmHernoemPalletScherm.FormShow(Sender: TObject);
 begin
-  inherited;
   btnCentraalOnder.Action := actHome;
   btnRechtsOnder.Action := actVolgende;
+  inherited;
 end;
 
 procedure TfmHernoemPalletScherm.VulGridMetToeleveringData(DnaCodes: array of DnaCode);
Index: AAPClient/UI/DrieKnoppenScherm.dfm
===================================================================
diff -u -r128 -r154
--- AAPClient/UI/DrieKnoppenScherm.dfm	(.../DrieKnoppenScherm.dfm)	(revision 128)
+++ AAPClient/UI/DrieKnoppenScherm.dfm	(.../DrieKnoppenScherm.dfm)	(revision 154)
@@ -87,6 +87,7 @@
       ImageAlignment = iaCenter
       ModalResult = 6
       TabOrder = 1
+      Visible = False
     end
     object btnLinksOnder: TButton
       Left = 2
@@ -97,6 +98,7 @@
       ImageAlignment = iaCenter
       ModalResult = 1
       TabOrder = 0
+      Visible = False
     end
     object btnRechtsOnder: TButton
       Left = 320
@@ -105,6 +107,7 @@
       Height = 33
       ImageAlignment = iaCenter
       TabOrder = 2
+      Visible = False
     end
   end
   object pnlTop: TPanel