diff --git a/src/zabapgit_object_sfbf.prog.abap b/src/zabapgit_object_sfbf.prog.abap
index 154582f2f..362328e85 100644
--- a/src/zabapgit_object_sfbf.prog.abap
+++ b/src/zabapgit_object_sfbf.prog.abap
@@ -33,7 +33,15 @@ CLASS lcl_object_sfbf IMPLEMENTATION.
 
   METHOD lif_object~changed_by.
 
-    rv_user = get( )->get_header_data( )-changedby.
+    DATA: ls_data TYPE sfw_bf.
+
+    ls_data = get( )->get_header_data( ).
+
+    rv_user = ls_data-changedby.
+
+    IF rv_user IS INITIAL.
+      rv_user = ls_data-author.
+    ENDIF.
 
   ENDMETHOD.
 
diff --git a/src/zabapgit_object_sfbs.prog.abap b/src/zabapgit_object_sfbs.prog.abap
index 78b76e509..fadb6235c 100644
--- a/src/zabapgit_object_sfbs.prog.abap
+++ b/src/zabapgit_object_sfbs.prog.abap
@@ -33,7 +33,15 @@ CLASS lcl_object_sfbs IMPLEMENTATION.
 
   METHOD lif_object~changed_by.
 
-    rv_user = get( )->get_header_data( )-changedby.
+    DATA: ls_data TYPE sfw_bs.
+
+    ls_data = get( )->get_header_data( ).
+
+    rv_user = ls_data-changedby.
+
+    IF rv_user IS INITIAL.
+      rv_user = ls_data-author.
+    ENDIF.
 
   ENDMETHOD.
 
diff --git a/src/zabapgit_object_sfsw.prog.abap b/src/zabapgit_object_sfsw.prog.abap
index 5f0d563c0..5f4e6a73f 100644
--- a/src/zabapgit_object_sfsw.prog.abap
+++ b/src/zabapgit_object_sfsw.prog.abap
@@ -33,7 +33,15 @@ CLASS lcl_object_sfsw IMPLEMENTATION.
 
   METHOD lif_object~changed_by.
 
-    rv_user = get( )->get_header_data( )-changedby.
+    DATA: ls_data TYPE sfw_switch.
+
+
+    ls_data = get( )->get_header_data( ).
+
+    rv_user = ls_data-changedby.
+    IF rv_user IS INITIAL.
+      rv_user = ls_data-author.
+    ENDIF.
 
   ENDMETHOD.