-% if ( $curuser->access_right('Waive setup fee') ) {
-% push @$pre_options, -2 => 'Waive setup fee';
-% }
-<& tr-td-label.html, label => emt('Setup fee') &>
+% push @$pre_options, -2 => 'Waive setup fee'
+% if $curuser->access_right('Waive setup fee')
+% && ! $opt{'disable_waive_setup'};
+<& tr-td-label.html, label => $opt{setup_label} || emt('Setup fee') &>