diff --git a/lib/NGCP/Panel/Controller/Invoice.pm b/lib/NGCP/Panel/Controller/Invoice.pm
index 6bdb345714..d1cebea5e9 100644
--- a/lib/NGCP/Panel/Controller/Invoice.pm
+++ b/lib/NGCP/Panel/Controller/Invoice.pm
@@ -251,7 +251,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac
                     my $call = {$_->get_inflated_columns};
                     $call->{start_time} = $call->{start_time}->epoch;
                     $call->{destination_user_in} =~s/%23/#/g;
-                    $call->{destination_user_in} = encode_entities($call->{destination_user_in}, '<>&"#');
+                    #$call->{destination_user_in} = encode_entities($call->{destination_user_in}, '<>&"#');
                     $call->{source_customer_cost} += 0.0; # make sure it's a number
                     $call;
                 } $calllist_rs->all ];
diff --git a/share/templates/invoice/default/invoice_template_aux.tt b/share/templates/invoice/default/invoice_template_aux.tt
index 0e83145da6..01ee452175 100644
--- a/share/templates/invoice/default/invoice_template_aux.tt
+++ b/share/templates/invoice/default/invoice_template_aux.tt
@@ -93,7 +93,7 @@
                 END;
                 IF f.masklen;
                     l = f.masklen > val.length ? val.length : f.masklen;
-                    val = val.substr(l - 1, val.length - 1, f.mask);
+                    val = val.substr(l - 1, val.length - 1, f.mask) | html_entity('<>&"#');
                 END;
                 '<text font-family="' _ fontfamily  _ '" font-size="' _ fontsize  _ apply_units('fontsize') _ '" x="' _ x _ apply_units('position') _ '" y="' _ y _ apply_units('position') _ '" text-anchor="'_ anc _'">';
                     val;