diff --git a/core/src/main/java/haveno/core/api/model/PaymentAccountForm.java b/core/src/main/java/haveno/core/api/model/PaymentAccountForm.java
index 37da866031..d280ced31f 100644
--- a/core/src/main/java/haveno/core/api/model/PaymentAccountForm.java
+++ b/core/src/main/java/haveno/core/api/model/PaymentAccountForm.java
@@ -82,7 +82,8 @@ public final class PaymentAccountForm implements PersistablePayload {
         WECHAT_PAY,
         ALI_PAY,
         SWISH,
-        TRANSFERWISE_USD;
+        TRANSFERWISE_USD,
+        AMAZON_GIFT_CARD;
 
         public static PaymentAccountForm.FormId fromProto(protobuf.PaymentAccountForm.FormId formId) {
             return ProtoUtil.enumFromProto(PaymentAccountForm.FormId.class, formId.name());
diff --git a/core/src/main/java/haveno/core/payment/AmazonGiftCardAccount.java b/core/src/main/java/haveno/core/payment/AmazonGiftCardAccount.java
index cb3eb35c70..65cf5719ae 100644
--- a/core/src/main/java/haveno/core/payment/AmazonGiftCardAccount.java
+++ b/core/src/main/java/haveno/core/payment/AmazonGiftCardAccount.java
@@ -46,6 +46,14 @@ public final class AmazonGiftCardAccount extends PaymentAccount {
             new TraditionalCurrency("USD")
     );
 
+    private static final List<PaymentAccountFormField.FieldId> INPUT_FIELD_IDS = List.of(
+            PaymentAccountFormField.FieldId.EMAIL_OR_MOBILE_NR,
+            PaymentAccountFormField.FieldId.COUNTRY,
+            PaymentAccountFormField.FieldId.TRADE_CURRENCIES,
+            PaymentAccountFormField.FieldId.ACCOUNT_NAME,
+            PaymentAccountFormField.FieldId.SALT
+    );
+
     @Nullable
     private Country country;
 
@@ -65,7 +73,7 @@ public final class AmazonGiftCardAccount extends PaymentAccount {
 
     @Override
     public @NotNull List<PaymentAccountFormField.FieldId> getInputFieldIds() {
-        throw new RuntimeException("Not implemented");
+        return INPUT_FIELD_IDS;
     }
 
     public String getEmailOrMobileNr() {
@@ -97,4 +105,11 @@ public final class AmazonGiftCardAccount extends PaymentAccount {
     private AmazonGiftCardAccountPayload getAmazonGiftCardAccountPayload() {
         return (AmazonGiftCardAccountPayload) paymentAccountPayload;
     }
+
+    @Override
+    protected PaymentAccountFormField getEmptyFormField(PaymentAccountFormField.FieldId fieldId) {
+        var field = super.getEmptyFormField(fieldId);
+        if (field.getId() == PaymentAccountFormField.FieldId.TRADE_CURRENCIES) field.setComponent(PaymentAccountFormField.Component.SELECT_ONE);
+        return field;
+    }
 }
diff --git a/core/src/main/java/haveno/core/payment/PaymentAccountTypeAdapter.java b/core/src/main/java/haveno/core/payment/PaymentAccountTypeAdapter.java
index 0226fe4530..6ca6ea2bed 100644
--- a/core/src/main/java/haveno/core/payment/PaymentAccountTypeAdapter.java
+++ b/core/src/main/java/haveno/core/payment/PaymentAccountTypeAdapter.java
@@ -50,6 +50,7 @@ import static haveno.common.util.Utilities.decodeFromHex;
 import static haveno.core.locale.CountryUtil.findCountryByCode;
 import static haveno.core.locale.CurrencyUtil.getTradeCurrenciesInList;
 import static haveno.core.locale.CurrencyUtil.getTradeCurrency;
+import static haveno.core.payment.payload.PaymentMethod.AMAZON_GIFT_CARD_ID;
 import static haveno.core.payment.payload.PaymentMethod.MONEY_GRAM_ID;
 import static java.lang.String.format;
 import static java.util.Arrays.stream;
@@ -438,6 +439,8 @@ class PaymentAccountTypeAdapter extends TypeAdapter<PaymentAccount> {
                 // account.setSingleTradeCurrency(fiatCurrency);
             } else if (account.hasPaymentMethodWithId(MONEY_GRAM_ID)) {
                 ((MoneyGramAccount) account).setCountry(country.get());
+            } else if (account.hasPaymentMethodWithId(AMAZON_GIFT_CARD_ID)) {
+                ((AmazonGiftCardAccount) account).setCountry(country.get());
             } else {
                 String errMsg = format("cannot set the country on a %s",
                         paymentAccountType.getSimpleName());
diff --git a/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java b/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java
index f48aeed3c9..1768848669 100644
--- a/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java
+++ b/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java
@@ -373,7 +373,8 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
                 WECHAT_PAY_ID,
                 ALI_PAY_ID,
                 SWISH_ID,
-                TRANSFERWISE_USD_ID);
+                TRANSFERWISE_USD_ID,
+                AMAZON_GIFT_CARD_ID);
         return paymentMethods.stream().filter(paymentMethod -> paymentMethodIds.contains(paymentMethod.getId())).collect(Collectors.toList());
     }
 
diff --git a/desktop/src/main/java/haveno/desktop/components/paymentmethods/AmazonGiftCardForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AmazonGiftCardForm.java
index 3bcdc44075..6bd796bf7a 100644
--- a/desktop/src/main/java/haveno/desktop/components/paymentmethods/AmazonGiftCardForm.java
+++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AmazonGiftCardForm.java
@@ -120,7 +120,7 @@ public class AmazonGiftCardForm extends PaymentMethodForm {
 
     @Override
     protected void autoFillNameTextField() {
-        setAccountNameWithString(amazonGiftCardAccount.getEmailOrMobileNr());
+        setAccountNameWithString(amazonGiftCardAccount.getEmailOrMobileNr() == null ? "" : amazonGiftCardAccount.getEmailOrMobileNr());
     }
 
     @Override
diff --git a/proto/src/main/proto/pb.proto b/proto/src/main/proto/pb.proto
index eb82fdf203..5df4b5324c 100644
--- a/proto/src/main/proto/pb.proto
+++ b/proto/src/main/proto/pb.proto
@@ -1907,6 +1907,7 @@ message PaymentAccountForm {
         ALI_PAY = 21;
         SWISH = 22;
         TRANSFERWISE_USD = 23;
+        AMAZON_GIFT_CARD = 24;
     }
     FormId id = 1;
     repeated PaymentAccountFormField fields = 2;