diff --git a/src-db/database/sourcedata/AD_PREFERENCE.xml b/src-db/database/sourcedata/AD_PREFERENCE.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b7556d127d3e4a8c4ae7794052d9d98d61858177
--- /dev/null
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--48FC0B3569D24B20B841287D4329D462--><AD_PREFERENCE>
+<!--48FC0B3569D24B20B841287D4329D462-->  <AD_PREFERENCE_ID><![CDATA[48FC0B3569D24B20B841287D4329D462]]></AD_PREFERENCE_ID>
+<!--48FC0B3569D24B20B841287D4329D462-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--48FC0B3569D24B20B841287D4329D462-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--48FC0B3569D24B20B841287D4329D462-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--48FC0B3569D24B20B841287D4329D462-->  <PROPERTY><![CDATA[SAFTR_DoNotAskTaxIdInVerifiedReturns]]></PROPERTY>
+<!--48FC0B3569D24B20B841287D4329D462-->  <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--48FC0B3569D24B20B841287D4329D462-->  <AD_MODULE_ID><![CDATA[8257C8776A0A4FB6A9284E3D3B8B6B26]]></AD_MODULE_ID>
+<!--48FC0B3569D24B20B841287D4329D462--></AD_PREFERENCE>
+
+<!--4EB625F533E44C6BB8F6B31F8E166B8A--><AD_PREFERENCE>
+<!--4EB625F533E44C6BB8F6B31F8E166B8A-->  <AD_PREFERENCE_ID><![CDATA[4EB625F533E44C6BB8F6B31F8E166B8A]]></AD_PREFERENCE_ID>
+<!--4EB625F533E44C6BB8F6B31F8E166B8A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4EB625F533E44C6BB8F6B31F8E166B8A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4EB625F533E44C6BB8F6B31F8E166B8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4EB625F533E44C6BB8F6B31F8E166B8A-->  <VALUE><![CDATA[Y]]></VALUE>
+<!--4EB625F533E44C6BB8F6B31F8E166B8A-->  <PROPERTY><![CDATA[SAFTR_AskTaxIdInVerifiedReturns]]></PROPERTY>
+<!--4EB625F533E44C6BB8F6B31F8E166B8A-->  <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--4EB625F533E44C6BB8F6B31F8E166B8A-->  <AD_MODULE_ID><![CDATA[8257C8776A0A4FB6A9284E3D3B8B6B26]]></AD_MODULE_ID>
+<!--4EB625F533E44C6BB8F6B31F8E166B8A--></AD_PREFERENCE>
+
+</data>
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
index 77afb46e2cde915140eb7d0dbac67ef1465750a3..abc71ccda4f6d5a4ffad67a62fd98dcc5978598a 100644
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -1,5 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--C12D09EF179C4127A38FEAA34317446E--><AD_REF_LIST>
+<!--C12D09EF179C4127A38FEAA34317446E-->  <AD_REF_LIST_ID><![CDATA[C12D09EF179C4127A38FEAA34317446E]]></AD_REF_LIST_ID>
+<!--C12D09EF179C4127A38FEAA34317446E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C12D09EF179C4127A38FEAA34317446E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C12D09EF179C4127A38FEAA34317446E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C12D09EF179C4127A38FEAA34317446E-->  <VALUE><![CDATA[SAFTR_AskTaxIdInVerifiedReturns]]></VALUE>
+<!--C12D09EF179C4127A38FEAA34317446E-->  <NAME><![CDATA[Ask for TaxId in Verified Returns]]></NAME>
+<!--C12D09EF179C4127A38FEAA34317446E-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--C12D09EF179C4127A38FEAA34317446E-->  <AD_MODULE_ID><![CDATA[8257C8776A0A4FB6A9284E3D3B8B6B26]]></AD_MODULE_ID>
+<!--C12D09EF179C4127A38FEAA34317446E--></AD_REF_LIST>
+
 <!--F6E66C3EC5AF48FCB725939A9D24BA54--><AD_REF_LIST>
 <!--F6E66C3EC5AF48FCB725939A9D24BA54-->  <AD_REF_LIST_ID><![CDATA[F6E66C3EC5AF48FCB725939A9D24BA54]]></AD_REF_LIST_ID>
 <!--F6E66C3EC5AF48FCB725939A9D24BA54-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/com.practicsbs.saftpt.retail/js/hooks/checkpaymentapproval.js b/web/com.practicsbs.saftpt.retail/js/hooks/checkpaymentapproval.js
index 10b539861e79d13b97e56c444beeb073533d4cdb..4729eb163b062ab744c01134491240a115543021 100644
--- a/web/com.practicsbs.saftpt.retail/js/hooks/checkpaymentapproval.js
+++ b/web/com.practicsbs.saftpt.retail/js/hooks/checkpaymentapproval.js
@@ -10,6 +10,10 @@ OB.UTIL.HookManager.registerHook('OBPOS_CheckPaymentApproval', async function(
   callbacks
 ) {
   var popupOpened = false;
+  const askForTaxIdInVerifiedReturns = OB.MobileApp.model.hasPermission(
+    'SAFTR_AskTaxIdInVerifiedReturns',
+    true
+  );
 
   var callback = function() {
     OB.UTIL.HookManager.callbackExecutor(args, callbacks);
@@ -24,10 +28,14 @@ OB.UTIL.HookManager.registerHook('OBPOS_CheckPaymentApproval', async function(
         OB.MobileApp.model.get('terminal').businessPartner ===
         receipt.get('bp').get('id');
       var saftrTaxId = receipt.get('saftrTaxId');
+      debugger;
       if (
         isGenericCustomer &&
         !saftrTaxId &&
-        !receipt.get('saftrTaxIdSatisfied')
+        !receipt.get('saftrTaxIdSatisfied') &&
+        ((receipt.getPaymentStatus().isNegative &&
+          askForTaxIdInVerifiedReturns === true) ||
+          !receipt.getPaymentStatus().isNegative)
       ) {
         popupOpened = true;
         OB.MobileApp.view.$.containerWindow.getRoot().doShowPopup({