diff --git a/README.md b/README.md
index 1d7a2d98..b857afcc 100644
--- a/README.md
+++ b/README.md
@@ -381,7 +381,7 @@ There are multiple ways of getting support:
 
 - create a [new issue](https://github.com/dedicatedcode/reitti/issues/new/choose)
 - tag me on [Lemmy](https://discuss.tchncs.de/u/danielgraf)
-- or join **#reitti** on [irc.dedicatedcode.com](https://irc.dedicatedcode.com)
+- or join **#reitti** on [libera.chat](https://libera.chat)
 
 ## Translations
 
diff --git a/src/main/java/com/dedicatedcode/reitti/controller/UserSettingsControllerAdvice.java b/src/main/java/com/dedicatedcode/reitti/controller/UserSettingsControllerAdvice.java
index d897550e..a0541b07 100644
--- a/src/main/java/com/dedicatedcode/reitti/controller/UserSettingsControllerAdvice.java
+++ b/src/main/java/com/dedicatedcode/reitti/controller/UserSettingsControllerAdvice.java
@@ -50,7 +50,7 @@ public UserSettingsDTO getCurrentUserSettings() {
             // Return default settings for anonymous users
             return new UserSettingsDTO(false,
                                        Language.EN,
-                                       Locale.ENGLISH,
+                                       Locale.ENGLISH.toLanguageTag(),
                                        Instant.now(),
                                        UnitSystem.METRIC,
                                        DEFAULT_HOME_LATITUDE,
@@ -77,7 +77,7 @@ public UserSettingsDTO getCurrentUserSettings() {
             Language selectedLanguage = dbSettings.getSelectedLanguage();
             return new UserSettingsDTO(dbSettings.isPreferColoredMap(),
                                        selectedLanguage,
-                                       selectedLanguage.getLocale(),
+                                       selectedLanguage.getLocale().toLanguageTag(),
                                        latestData,
                                        dbSettings.getUnitSystem(),
                                        dbSettings.getHomeLatitude(),
@@ -92,7 +92,7 @@ public UserSettingsDTO getCurrentUserSettings() {
         // Fallback for authenticated users not found in database
         return new UserSettingsDTO(false,
                                    Language.EN,
-                                   Locale.ENGLISH,
+                                   Locale.ENGLISH.toLanguageTag(),
                                    Instant.now(),
                                    UnitSystem.METRIC,
                                    DEFAULT_HOME_LATITUDE,
@@ -119,6 +119,7 @@ private UserSettingsDTO.UIMode mapUserToUiMode(Authentication authentication) {
             throw new IllegalStateException("Invalid user authentication mode detected [" + grantedRoles + "]");
         }
     }
+
     private UserSettingsDTO.PhotoMode mapUserToPhotoMode(Authentication authentication) {
         List<String> grantedRoles = authentication.getAuthorities().stream().map(GrantedAuthority::getAuthority).toList();
         if (grantedRoles.contains("ROLE_ADMIN") ||
diff --git a/src/main/java/com/dedicatedcode/reitti/dto/UserSettingsDTO.java b/src/main/java/com/dedicatedcode/reitti/dto/UserSettingsDTO.java
index 307c32f0..ff0c6af5 100644
--- a/src/main/java/com/dedicatedcode/reitti/dto/UserSettingsDTO.java
+++ b/src/main/java/com/dedicatedcode/reitti/dto/UserSettingsDTO.java
@@ -11,7 +11,7 @@
 public record UserSettingsDTO(
         boolean preferColoredMap,
         Language selectedLanguage,
-        Locale selectedLocale,
+        String selectedLocale,
         Instant newestData,
         UnitSystem unitSystem,
         Double homeLatitude,