diff --git a/cli/src/main/java/bisq/cli/CliMain.java b/cli/src/main/java/bisq/cli/CliMain.java
index f768430b62..8e5d275c76 100644
--- a/cli/src/main/java/bisq/cli/CliMain.java
+++ b/cli/src/main/java/bisq/cli/CliMain.java
@@ -184,14 +184,14 @@ public class CliMain {
                     if (nonOptionArgs.size() < 2)
                         throw new IllegalArgumentException("no buy/sell direction specified");
 
-                    var direction = nonOptionArgs.get(1).toUpperCase();
-                    if (!direction.equals("BUY") && !direction.equals("SELL"))
+                    var direction = nonOptionArgs.get(1);
+                    if (!direction.equalsIgnoreCase("BUY") && !direction.equalsIgnoreCase("SELL"))
                         throw new IllegalArgumentException("no buy/sell direction specified");
 
                     if (nonOptionArgs.size() < 3)
                         throw new IllegalArgumentException("no fiat currency specified");
 
-                    var fiatCurrency = nonOptionArgs.get(2).toUpperCase();
+                    var fiatCurrency = nonOptionArgs.get(2);
 
                     var request = GetOffersRequest.newBuilder()
                             .setDirection(direction)
@@ -215,7 +215,7 @@ public class CliMain {
                     if (nonOptionArgs.size() < 4)
                         throw new IllegalArgumentException("no fiat currency specified");
 
-                    var fiatCurrencyCode = nonOptionArgs.get(3).toUpperCase();
+                    var fiatCurrencyCode = nonOptionArgs.get(3);
 
                     var request = CreatePaymentAccountRequest.newBuilder()
                             .setAccountName(accountName)
diff --git a/core/src/main/java/bisq/core/grpc/CoreOffersService.java b/core/src/main/java/bisq/core/grpc/CoreOffersService.java
index 95bf4d478e..3ac365bd88 100644
--- a/core/src/main/java/bisq/core/grpc/CoreOffersService.java
+++ b/core/src/main/java/bisq/core/grpc/CoreOffersService.java
@@ -60,8 +60,8 @@ public class CoreOffersService {
 
     public List<Offer> getOffers(String direction, String fiatCurrencyCode) {
         List<Offer> offers = offerBookService.getOffers().stream()
-                .filter(o -> !o.getDirection().name().equals(direction)
-                        && o.getOfferPayload().getCounterCurrencyCode().equals(fiatCurrencyCode))
+                .filter(o -> !o.getDirection().name().equalsIgnoreCase(direction)
+                        && o.getOfferPayload().getCounterCurrencyCode().equalsIgnoreCase(fiatCurrencyCode))
                 .collect(Collectors.toList());
 
         if (direction.equals(BUY.name()))
diff --git a/core/src/main/java/bisq/core/grpc/CorePaymentAccountsService.java b/core/src/main/java/bisq/core/grpc/CorePaymentAccountsService.java
index c6c2613e1c..9a7183d21a 100644
--- a/core/src/main/java/bisq/core/grpc/CorePaymentAccountsService.java
+++ b/core/src/main/java/bisq/core/grpc/CorePaymentAccountsService.java
@@ -58,7 +58,7 @@ public class CorePaymentAccountsService {
         paymentAccount.init();
         paymentAccount.setAccountName(accountName);
         ((PerfectMoneyAccount) paymentAccount).setAccountNr(accountNumber);
-        paymentAccount.setSingleTradeCurrency(new FiatCurrency(fiatCurrencyCode));
+        paymentAccount.setSingleTradeCurrency(new FiatCurrency(fiatCurrencyCode.toUpperCase()));
         user.addPaymentAccount(paymentAccount);
 
         // Don't do this on mainnet until thoroughly tested.