diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index fdda850d637..6a079ca37ac 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -3314,11 +3314,15 @@ payment.payid=PayID linked to financial institution. Like email address or mobil
 payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your \
   bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. \
   Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/]
-payment.amazonGiftCard.info=To pay with Amazon eGift Card you need to purchase an Amazon eGift Card at your Amazon account and \
-  use the BTC seller''s email or mobile nr. as receiver. Amazon sends then an email or text message to the receiver. \
-  Use the trade ID for the message field.\n\n\
-  Amazon eGift Cards can only be redeemed by Amazon accounts with the same currency.\n\n\
-  For more information visit the Amazon eGift Card webpage. [HYPERLINK:https://www.amazon.com/Amazon-1_US_Email-eGift-Card/dp/B004LLIKVU]
+payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\n\
+  Bisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift \
+  card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\n\
+  Three important notes:\n\
+  - try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n\
+  - try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat \
+  to tell your trading peer the reference text you picked so they can verify your payment)\n\
+  - Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+
 
 # We use constants from the code so we do not use our normal naming convention
 # dynamic values are not recognized by IntelliJ
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java
index 32d961ea449..a9532ff0fdb 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java
@@ -69,7 +69,6 @@ public AmazonGiftCardForm(PaymentAccount paymentAccount,
     public void addTradeCurrency() {
         addTradeCurrencyComboBox();
         currencyComboBox.setItems(FXCollections.observableArrayList(CurrencyUtil.getAllAmazonGiftCardCurrencies()));
-        currencyComboBox.getSelectionModel().select(0);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PerfectMoneyForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PerfectMoneyForm.java
index c54aeafd545..b91e036d794 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PerfectMoneyForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PerfectMoneyForm.java
@@ -54,7 +54,6 @@ public PerfectMoneyForm(PaymentAccount paymentAccount, AccountAgeWitnessService
     public void addTradeCurrency() {
         addTradeCurrencyComboBox();
         currencyComboBox.setItems(FXCollections.observableArrayList(new FiatCurrency("USD"), new FiatCurrency("EUR")));
-        currencyComboBox.getSelectionModel().select(0);
     }
 
     @Override