diff --git a/uncrustify.cfg b/uncrustify.cfg
index c8e26fb71..d373e53b6 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -1450,7 +1450,7 @@ pos_conditional                 = trail   # ignore/join/lead/lead_break/lead_for
 pos_comma                       = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
 # The position of the comma in enum entries.
-pos_enum_comma                  = trail_break   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
+pos_enum_comma                  = trail   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
 # The position of the comma in the base class list if there are more than one line,
 #   (tied to nl_class_init_args).
@@ -1584,7 +1584,7 @@ align_var_struct_thresh         = 0        # unsigned number
 align_var_struct_gap            = 1        # unsigned number
 
 # The span for aligning struct initializer values (0=don't align)
-align_struct_init_span            = 1        # unsigned number
+align_struct_init_span            = 0        # unsigned number
 
 # The minimum space between the type and the synonym of a typedef.
 align_typedef_gap               = 1        # unsigned number