diff --git a/src/objects/zcl_abapgit_objects_program.clas.abap b/src/objects/zcl_abapgit_objects_program.clas.abap
index 119941d65..3f8c428c3 100644
--- a/src/objects/zcl_abapgit_objects_program.clas.abap
+++ b/src/objects/zcl_abapgit_objects_program.clas.abap
@@ -191,29 +191,37 @@ CLASS ZCL_ABAPGIT_OBJECTS_PROGRAM IMPLEMENTATION.
 
   METHOD auto_correct_cua_adm.
     " issue #1807 automatic correction of CUA interfaces saved incorrectly in the past (ADM was not saved in the XML)
+
+    CONSTANTS:
+      lc_num_n_space TYPE string VALUE ' 0123456789',
+      lc_num_only    TYPE string VALUE '0123456789'.
+
     FIELD-SYMBOLS:
       <ls_pfk> TYPE rsmpe_pfk,
       <ls_act> TYPE rsmpe_act,
       <ls_men> TYPE rsmpe_men.
 
-    IF cs_adm IS NOT INITIAL.
+    IF cs_adm IS NOT INITIAL
+    AND (     cs_adm-actcode CO lc_num_n_space
+          AND cs_adm-mencode CO lc_num_n_space
+          AND cs_adm-pfkcode CO lc_num_n_space ). "Check performed in form check_adm of include LSMPIF03
       RETURN.
     ENDIF.
 
     LOOP AT is_cua-act ASSIGNING <ls_act>.
-      IF <ls_act>-code+6(14) IS INITIAL AND <ls_act>-code(6) CO '0123456789'.
+      IF <ls_act>-code+6(14) IS INITIAL AND <ls_act>-code(6) CO lc_num_only.
         cs_adm-actcode = <ls_act>-code.
       ENDIF.
     ENDLOOP.
 
     LOOP AT is_cua-men ASSIGNING <ls_men>.
-      IF <ls_men>-code+6(14) IS INITIAL AND <ls_men>-code(6) CO '0123456789'.
+      IF <ls_men>-code+6(14) IS INITIAL AND <ls_men>-code(6) CO lc_num_only.
         cs_adm-mencode = <ls_men>-code.
       ENDIF.
     ENDLOOP.
 
     LOOP AT is_cua-pfk ASSIGNING <ls_pfk>.
-      IF <ls_pfk>-code+6(14) IS INITIAL AND <ls_pfk>-code(6) CO '0123456789'.
+      IF <ls_pfk>-code+6(14) IS INITIAL AND <ls_pfk>-code(6) CO lc_num_only.
         cs_adm-pfkcode = <ls_pfk>-code.
       ENDIF.
     ENDLOOP.