diff --git a/lib/NGCP/Panel/I18N/de.po b/lib/NGCP/Panel/I18N/de.po
index c73685c841..eef73f39b3 100644
--- a/lib/NGCP/Panel/I18N/de.po
+++ b/lib/NGCP/Panel/I18N/de.po
@@ -5275,10 +5275,16 @@ msgstr ""
 #: lib/NGCP/Panel/Utils/DbStrings.pm
 msgid ""
 "If set, the UPN of the calling party is not checked against the allowed CLIs "
-"provisioned for this subscriber if a Diversion or History-Info header is "
-"provided in an incoming call. This can be used to allow diversion on the "
-"subscriber device and transporting the originally calling party number on "
-"the second leg. Use with caution as it might allow for number spoofing."
+"provisioned for the subscriber if a Diversion or History-Info header that "
+"meets the selected criteria has been sent by the calling subscriber. The "
+"recommended mode here, for example when connecting external PBX to NGCP, is "
+"\"If user in received Diversion or History-Info header is in caller's alias "
+"list\", as this validates the forwarding number in received Diversion/"
+"History-Info header against subscriber's aliases and is a safer choice than "
+"enabling UPN check bypass when any header is present. If any mode other than "
+"\"Never\" is selected, the forwarding number in the History-Info header is "
+"checked and the History-Info is rewritten if it doesn't match any alias "
+"numbers."
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
@@ -8926,7 +8932,7 @@ msgid "Skip Rewrite"
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
-msgid "Skip UPN check on Diversion"
+msgid "Skip UPN check if received Diversion/History-Info header"
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
diff --git a/lib/NGCP/Panel/I18N/es.po b/lib/NGCP/Panel/I18N/es.po
index 3e91d30348..680f90486f 100644
--- a/lib/NGCP/Panel/I18N/es.po
+++ b/lib/NGCP/Panel/I18N/es.po
@@ -5276,10 +5276,16 @@ msgstr ""
 #: lib/NGCP/Panel/Utils/DbStrings.pm
 msgid ""
 "If set, the UPN of the calling party is not checked against the allowed CLIs "
-"provisioned for this subscriber if a Diversion or History-Info header is "
-"provided in an incoming call. This can be used to allow diversion on the "
-"subscriber device and transporting the originally calling party number on "
-"the second leg. Use with caution as it might allow for number spoofing."
+"provisioned for the subscriber if a Diversion or History-Info header that "
+"meets the selected criteria has been sent by the calling subscriber. The "
+"recommended mode here, for example when connecting external PBX to NGCP, is "
+"\"If user in received Diversion or History-Info header is in caller's alias "
+"list\", as this validates the forwarding number in received Diversion/"
+"History-Info header against subscriber's aliases and is a safer choice than "
+"enabling UPN check bypass when any header is present. If any mode other than "
+"\"Never\" is selected, the forwarding number in the History-Info header is "
+"checked and the History-Info is rewritten if it doesn't match any alias "
+"numbers."
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
@@ -8940,7 +8946,7 @@ msgid "Skip Rewrite"
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
-msgid "Skip UPN check on Diversion"
+msgid "Skip UPN check if received Diversion/History-Info header"
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
diff --git a/lib/NGCP/Panel/I18N/it.po b/lib/NGCP/Panel/I18N/it.po
index cb82fc5f08..9d906636d2 100644
--- a/lib/NGCP/Panel/I18N/it.po
+++ b/lib/NGCP/Panel/I18N/it.po
@@ -5450,17 +5450,17 @@ msgstr ""
 #: lib/NGCP/Panel/Utils/DbStrings.pm
 msgid ""
 "If set, the UPN of the calling party is not checked against the allowed CLIs "
-"provisioned for this subscriber if a Diversion or History-Info header is "
-"provided in an incoming call. This can be used to allow diversion on the "
-"subscriber device and transporting the originally calling party number on "
-"the second leg. Use with caution as it might allow for number spoofing."
+"provisioned for the subscriber if a Diversion or History-Info header that "
+"meets the selected criteria has been sent by the calling subscriber. The "
+"recommended mode here, for example when connecting external PBX to NGCP, is "
+"\"If user in received Diversion or History-Info header is in caller's alias "
+"list\", as this validates the forwarding number in received Diversion/"
+"History-Info header against subscriber's aliases and is a safer choice than "
+"enabling UPN check bypass when any header is present. If any mode other than "
+"\"Never\" is selected, the forwarding number in the History-Info header is "
+"checked and the History-Info is rewritten if it doesn't match any alias "
+"numbers."
 msgstr ""
-"Se settato, lo UPN del chiamante non verrà confrontato con la lista dei CLI "
-"permessi configurata per questo abbonato SE sono presenti nel messaggio SIP "
-"un Diversion header oppure un History-Info header. Questo può essere usato "
-"per permettere deviazioni dal dispositivo dell´abbonato e trasportare l"
-"´informazione del numero chiamante di origine al numero destinatario finale."
-"Usare con cautela, potrebbe consentire lo spoofing the numero."
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
 msgid ""
@@ -9175,8 +9175,8 @@ msgid "Skip Rewrite"
 msgstr "Salta Rewrite"
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
-msgid "Skip UPN check on Diversion"
-msgstr "Salta controllo UPN su header Diversion"
+msgid "Skip UPN check if received Diversion/History-Info header"
+msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
 msgid "Skip callee LNP lookup"
@@ -13934,6 +13934,25 @@ msgstr ""
 msgid "yes"
 msgstr "si"
 
+#~ msgid ""
+#~ "If set, the UPN of the calling party is not checked against the allowed "
+#~ "CLIs provisioned for this subscriber if a Diversion or History-Info "
+#~ "header is provided in an incoming call. This can be used to allow "
+#~ "diversion on the subscriber device and transporting the originally "
+#~ "calling party number on the second leg. Use with caution as it might "
+#~ "allow for number spoofing."
+#~ msgstr ""
+#~ "Se settato, lo UPN del chiamante non verrà confrontato con la lista dei "
+#~ "CLI permessi configurata per questo abbonato SE sono presenti nel "
+#~ "messaggio SIP un Diversion header oppure un History-Info header. Questo "
+#~ "può essere usato per permettere deviazioni dal dispositivo dell´abbonato "
+#~ "e trasportare l´informazione del numero chiamante di origine al numero "
+#~ "destinatario finale.Usare con cautela, potrebbe consentire lo spoofing "
+#~ "the numero."
+
+#~ msgid "Skip UPN check on Diversion"
+#~ msgstr "Salta controllo UPN su header Diversion"
+
 #~ msgid "Reseller successfully created"
 #~ msgstr "Rivenditore creato con successo"
 
diff --git a/lib/NGCP/Panel/I18N/messages.pot b/lib/NGCP/Panel/I18N/messages.pot
index 2b38b312be..06c77d6ee6 100644
--- a/lib/NGCP/Panel/I18N/messages.pot
+++ b/lib/NGCP/Panel/I18N/messages.pot
@@ -4666,7 +4666,7 @@ msgid "If reject code is specified and the call is rejected, the reason in the r
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
-msgid "If set, the UPN of the calling party is not checked against the allowed CLIs provisioned for this subscriber if a Diversion or History-Info header is provided in an incoming call. This can be used to allow diversion on the subscriber device and transporting the originally calling party number on the second leg. Use with caution as it might allow for number spoofing."
+msgid "If set, the UPN of the calling party is not checked against the allowed CLIs provisioned for the subscriber if a Diversion or History-Info header that meets the selected criteria has been sent by the calling subscriber. The recommended mode here, for example when connecting external PBX to NGCP, is \"If user in received Diversion or History-Info header is in caller's alias list\", as this validates the forwarding number in received Diversion/History-Info header against subscriber's aliases and is a safer choice than enabling UPN check bypass when any header is present. If any mode other than \"Never\" is selected, the forwarding number in the History-Info header is checked and the History-Info is rewritten if it doesn't match any alias numbers."
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
@@ -8007,7 +8007,7 @@ msgid "Skip Rewrite"
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
-msgid "Skip UPN check on Diversion"
+msgid "Skip UPN check if received Diversion/History-Info header"
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
diff --git a/lib/NGCP/Panel/I18N/ru.po b/lib/NGCP/Panel/I18N/ru.po
index 1828b3870b..2c71fc7452 100644
--- a/lib/NGCP/Panel/I18N/ru.po
+++ b/lib/NGCP/Panel/I18N/ru.po
@@ -5272,10 +5272,16 @@ msgstr ""
 #: lib/NGCP/Panel/Utils/DbStrings.pm
 msgid ""
 "If set, the UPN of the calling party is not checked against the allowed CLIs "
-"provisioned for this subscriber if a Diversion or History-Info header is "
-"provided in an incoming call. This can be used to allow diversion on the "
-"subscriber device and transporting the originally calling party number on "
-"the second leg. Use with caution as it might allow for number spoofing."
+"provisioned for the subscriber if a Diversion or History-Info header that "
+"meets the selected criteria has been sent by the calling subscriber. The "
+"recommended mode here, for example when connecting external PBX to NGCP, is "
+"\"If user in received Diversion or History-Info header is in caller's alias "
+"list\", as this validates the forwarding number in received Diversion/"
+"History-Info header against subscriber's aliases and is a safer choice than "
+"enabling UPN check bypass when any header is present. If any mode other than "
+"\"Never\" is selected, the forwarding number in the History-Info header is "
+"checked and the History-Info is rewritten if it doesn't match any alias "
+"numbers."
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
@@ -8935,7 +8941,7 @@ msgid "Skip Rewrite"
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm
-msgid "Skip UPN check on Diversion"
+msgid "Skip UPN check if received Diversion/History-Info header"
 msgstr ""
 
 #: lib/NGCP/Panel/Utils/DbStrings.pm