Index: AAPClient/UI/HernoemPalletScherm.pas
===================================================================
diff -u -r335 -r336
--- AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 335)
+++ AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 336)
@@ -72,17 +72,20 @@
   if pcHernoemPallet.ActivePageIndex = 0 then begin
     fEnkelDezeDnaCode := '';
     if TCommonFunctions.IsKaderdeurLocatie(edtOudeCode.Text) then begin
-      ToonPopupScherm('Kaderdeurlocaties kunnen niet ingescand worden.','Probeer opnieuw','')
-    end else if ((length(edtOudeCode.Text)=7) and CheckBestaandeDnaCode(edtOudeCode.Text)) then begin
-      if ToonPopupScherm('Enkel code ''' + TCommonFunctions.VerkorteDnaCode(edtOudeCode.Text) + ''' verwerken?','Ja','Nee',14,6,7) = mrYes then begin
-         fEnkelDezeDnaCode := edtOudeCode.Text
+      ToonPopupScherm('Kaderdeurlocaties kunnen niet ingescand worden.','Probeer opnieuw','');
+      edtOudeCode.Text := '';
+    end else begin
+      if ((length(edtOudeCode.Text)=7) and CheckBestaandeDnaCode(edtOudeCode.Text)) then begin
+        if ToonPopupScherm('Enkel code ''' + TCommonFunctions.VerkorteDnaCode(edtOudeCode.Text) + ''' verwerken?','Ja','Nee',14,6,7) = mrYes then begin
+           fEnkelDezeDnaCode := edtOudeCode.Text
+        end;
       end;
+      HernoemPallet(edtOudeCode.Text,'');
+      if fEnkelDezeDnaCode = '' then
+        pcHernoemPallet.ActivePageIndex := 1
+      else
+        pcHernoemPallet.ActivePageIndex := 2;
     end;
-    HernoemPallet(edtOudeCode.Text,'');
-    if fEnkelDezeDnaCode = '' then
-      pcHernoemPallet.ActivePageIndex := 1
-    else
-      pcHernoemPallet.ActivePageIndex := 2;
   end else if pcHernoemPallet.ActivePageIndex = 1 then begin
     pcHernoemPallet.ActivePageIndex := 2;
   end else if pcHernoemPallet.ActivePageIndex = 2 then begin
Index: AAPClient/UI/HernoemPalletScherm.dfm
===================================================================
diff -u -r335 -r336
--- AAPClient/UI/HernoemPalletScherm.dfm	(.../HernoemPalletScherm.dfm)	(revision 335)
+++ AAPClient/UI/HernoemPalletScherm.dfm	(.../HernoemPalletScherm.dfm)	(revision 336)
@@ -42,17 +42,13 @@
     Top = 57
     Width = 480
     Height = 451
-    ActivePage = tsResultaat
+    ActivePage = tsNieuweCode
     Align = alClient
     Style = tsFlatButtons
     TabOrder = 2
     object tsOudeCode: TTabSheet
       Caption = 'tsOudeCode'
       TabVisible = False
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object lblOudeCode: TLabel
         Left = 13
         Top = 248
@@ -590,6 +586,7 @@
         Top = 305
         Width = 345
         Height = 47
+        Alignment = taCenter
         CharCase = ecUpperCase
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -673,10 +670,6 @@
       Caption = 'tsNieuweCode'
       ImageIndex = 2
       TabVisible = False
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object lblNieuweCode: TLabel
         Left = 13
         Top = 207
@@ -1214,6 +1207,7 @@
         Top = 305
         Width = 345
         Height = 47
+        Alignment = taCenter
         CharCase = ecUpperCase
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText