diff --git a/distribution/src/conf/openfire.xml b/distribution/src/conf/openfire.xml
index 76f56d1543..f64b1ad6c1 100644
--- a/distribution/src/conf/openfire.xml
+++ b/distribution/src/conf/openfire.xml
@@ -22,7 +22,7 @@
         <securePort>9091</securePort>
     </adminConsole>
 
-    <locale>en</locale>
+    <locale></locale>
 
     <!-- Network settings. By default, Openfire will bind to all network interfaces.
       Alternatively, you can specify a specific network interfaces that the server
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/LocaleUtils.java b/xmppserver/src/main/java/org/jivesoftware/util/LocaleUtils.java
index bd653da987..454e830ef5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/LocaleUtils.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/LocaleUtils.java
@@ -159,7 +159,7 @@ public static Locale localeCodeToLocale(String localeCode) {
     };
 
     // A mapping from the supported timezone ids to friendly english names.
-    private static final Map<String, String> nameMap = new HashMap<>();
+    private static final Map<String, String> nameMap = new HashMap<>(75);
 
     static {
         nameMap.put(timeZoneIds[0], "International Date Line West");
@@ -239,6 +239,75 @@ public static Locale localeCodeToLocale(String localeCode) {
         nameMap.put(timeZoneIds[74], "Nuku'alofa");
     }
 
+    private static final Map<String, String> supportedLocales = new LinkedHashMap<>(20);
+    static {
+        supportedLocales.put("cs_CZ", "Czech");
+        supportedLocales.put("de", "Deutsch");
+        supportedLocales.put("en", "English");
+        supportedLocales.put("es", "Español");
+        supportedLocales.put("fa_IR", "فارسی");
+        supportedLocales.put("fr", "Français");
+        supportedLocales.put("he", "עברית");
+        supportedLocales.put("it_IT", "Italiano");
+        supportedLocales.put("ja_JP", "日本語");
+        supportedLocales.put("nl", "Nederlands");
+        supportedLocales.put("pl_PL", "Polski");
+        supportedLocales.put("pt_PT", "Português Portugal");
+        supportedLocales.put("pt_BR", "Português Brasileiro");
+        supportedLocales.put("ru_RU", "Русский");
+        supportedLocales.put("sk", "Slovenčina");
+        supportedLocales.put("sv", "Svenska");
+        supportedLocales.put("tr_TR", "Türkçe");
+        supportedLocales.put("uk_UA", "Українська");
+        supportedLocales.put("zh_CN", "中文简体");
+    }
+
+    /**
+     * Get list of locales (code: name) that the web admin has translations for.
+     */
+    public static Map<String, String> getSupportedLocales() {
+        return supportedLocales;
+    }
+
+    /**
+     * Find the preferred locale from user browser from list of supported.
+     */
+    public static String bestMatchingSupportedLocale(Enumeration<Locale> requestLocales) {
+        Map<String, String> supportedLocalesByLang = null; // cs: cs_CZ, pt: pt_PT etc.
+        while (requestLocales.hasMoreElements()) {
+            Locale reqLocale = requestLocales.nextElement();
+            String language = reqLocale.getLanguage();
+            String country = reqLocale.getCountry();
+            // First try an exact language + country match
+            if (!country.isEmpty()) {
+                String exactLocaleCode = language + "_" + country;
+                if (supportedLocales.containsKey(exactLocaleCode)) {
+                    return exactLocaleCode;
+                }
+            }
+            // Then fall back to a language-only match.
+            if (supportedLocales.containsKey(language)) {
+                return language;
+            }
+            // lazy init supportedLocalesByLang
+            if (supportedLocalesByLang == null) {
+                supportedLocalesByLang = new HashMap<>();
+                for (String supportedLocale : supportedLocales.keySet()) {
+                    String[] parts = supportedLocale.split("_");
+                    if (parts.length == 2) {
+                        supportedLocalesByLang.putIfAbsent(parts[0], supportedLocale);
+                    }
+                }
+            }
+            String localeCode = supportedLocalesByLang.get(language);
+            if (localeCode != null) {
+                return localeCode;
+            }
+        }
+        // if no match then take server default locale
+        return JiveGlobals.getLocale().toString();
+    }
+
     /**
      * Returns a list of all available time zone's as a String [][]. The first
      * entry in each list item is the timeZoneID, and the second is the
@@ -355,7 +424,7 @@ public static boolean isLocalizedTextRTL() {
         // This is obviously not something that's re-usable outside of Openfire. However, this includes all languages
         // for which we provide translations.
         String language = JiveGlobals.getLocale().getLanguage();
-        return language.equals(new Locale("he").getLanguage()) || language.equals(new Locale("fa").getLanguage());
+        return language.equals("he") || language.equals("fa");
     }
 
 
diff --git a/xmppserver/src/main/webapp/images/setup_language_zh_CN.gif b/xmppserver/src/main/webapp/images/setup_language_zh_CN.gif
deleted file mode 100644
index f0610f10ed..0000000000
Binary files a/xmppserver/src/main/webapp/images/setup_language_zh_CN.gif and /dev/null differ
diff --git a/xmppserver/src/main/webapp/server-locale.jsp b/xmppserver/src/main/webapp/server-locale.jsp
index af73e76415..c8b4d20b6c 100644
--- a/xmppserver/src/main/webapp/server-locale.jsp
+++ b/xmppserver/src/main/webapp/server-locale.jsp
@@ -15,10 +15,7 @@
   - limitations under the License.
 --%>
 <%@ page contentType="text/html; charset=UTF-8" %>
-<%@ page import="java.util.HashMap" %>
-<%@ page import="java.util.Locale" %>
-<%@ page import="java.util.Map" %>
-<%@ page import="java.util.TimeZone" %>
+<%@ page import="java.util.*" %>
 <%@ page import="org.jivesoftware.util.CookieUtils" %>
 <%@ page import="org.jivesoftware.util.JiveGlobals" %>
 <%@ page import="org.jivesoftware.util.LocaleUtils" %>
@@ -81,7 +78,9 @@
         }
     }
 
+    pageContext.setAttribute( "locales", LocaleUtils.getSupportedLocales() );
     Locale locale = JiveGlobals.getLocale();
+    pageContext.setAttribute( "locale", locale.toString() );
 
     // Get the time zone list.
     String[][] timeZones = LocaleUtils.getTimeZoneList();
@@ -120,181 +119,18 @@
     </div>
     <div class="jive-contentBox">
         <p>
-        <b><fmt:message key="locale.current" />:</b> <%= locale.getDisplayName(locale) %> /
+        <b><fmt:message key="locale.current" />:</b> ${locales[locale]} /
             <%= LocaleUtils.getTimeZoneName(JiveGlobals.getTimeZone().getID(), locale) %>
         </p>
 
-        <%  boolean usingPreset;
-            Locale[] locales = Locale.getAvailableLocales();
-            for (Locale locale1 : locales) {
-                usingPreset = locale1.equals(locale);
-                if (usingPreset) {
-                    break;
-                }
-            }
-        %>
-
         <p><b><fmt:message key="language.choose" />:</b></p>
 
-        <table>
-        <tbody>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="cs_CZ" <%= ("cs_CZ".equals(locale.toString()) ? "checked" : "") %> id="cs_CZ" />
-                </td>
-                <td colspan="2">
-                    <label for="cs_CZ">Czech (cs_CZ)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="de" <%= ("de".equals(locale.toString()) ? "checked" : "") %> id="de" />
-                </td>
-                <td colspan="2">
-                    <label for="de">Deutsch (de)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="en" <%= ("en".equals(locale.toString()) ? "checked" : "") %> id="en" />
-                </td>
-                <td colspan="2">
-                    <label for="en">English (en)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="es" <%= ("es".equals(locale.toString()) ? "checked" : "") %> id="es" />
-                </td>
-                <td colspan="2">
-                    <label for="es">Espa&ntilde;ol (es)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="fa_IR" <%= ("fa_IR".equals(locale.toString()) ? "checked" : "") %> id="fa_IR" />
-                </td>
-                <td colspan="2">
-                    <label for="fa_IR">فارسی (fa_IR)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="fr" <%= ("fr".equals(locale.toString()) ? "checked" : "") %> id="fr" />
-                </td>
-                <td colspan="2">
-                    <label for="fr">Fran&ccedil;ais (fr)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="he" <%= ("he".equals(locale.toString()) ? "checked" : "") %> id="he" />
-                </td>
-                <td colspan="2">
-                    <label for="he">עברית (he)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="it_IT" <%= ("it_IT".equals(locale.toString()) ? "checked" : "") %> id="it_IT" />
-                </td>
-                <td colspan="2">
-                    <label for="it_IT">Italiano (it_IT)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="ja_JP" <%= ("ja_JP".equals(locale.toString()) ? "checked" : "") %> id="ja_JP" />
-                </td>
-                <td colspan="2">
-                    <label for="ja_JP">日本語 (ja_JP)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="nl" <%= ("nl".equals(locale.toString()) ? "checked" : "") %> id="nl" />
-                </td>
-                <td colspan="2">
-                    <label for="nl">Nederlands (nl)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="pl_PL" <%= ("pl_PL".equals(locale.toString()) ? "checked" : "") %> id="pl_PL" />
-                </td>
-                <td colspan="2">
-                    <label for="pl_PL">Polski (pl_PL)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="pt_PT" <%= ("pt_PT".equals(locale.toString()) ? "checked" : "") %> id="pt_PT" />
-                </td>
-                <td colspan="2">
-                    <label for="pt_PT">Portugu&ecirc;s Portugal (pt_PT)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="pt_BR" <%= ("pt_BR".equals(locale.toString()) ? "checked" : "") %> id="pt_BR" />
-                </td>
-                <td colspan="2">
-                    <label for="pt_BR">Portugu&ecirc;s Brasileiro (pt_BR)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="ru_RU" <%= ("ru_RU".equals(locale.toString()) ? "checked" : "") %> id="ru_RU" />
-                </td>
-                <td colspan="2">
-                    <label for="ru_RU">&#x420;&#x443;&#x441;&#x441;&#x43A;&#x438;&#x439; (ru_RU)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="sk" <%= ("sk".equals(locale.toString()) ? "checked" : "") %> id="sk" />
-                </td>
-                <td colspan="2">
-                    <label for="sk">Sloven&#269;ina (sk)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="sv" <%= ("sv".equals(locale.toString()) ? "checked" : "") %> id="sv" />
-                </td>
-                <td colspan="2">
-                    <label for="sv">Svenska (sv)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="tr_TR" <%= ("tr_TR".equals(locale.toString()) ? "checked" : "") %> id="tr_TR" />
-                </td>
-                <td colspan="2">
-                    <label for="tr_TR">Türkçe (tr_TR)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="uk_UA" <%= ("uk_UA".equals(locale.toString()) ? "checked" : "") %> id="uk_UA" />
-                </td>
-                <td colspan="2">
-                    <label for="uk_UA">Українська (uk_UA)</label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="localeCode" value="zh_CN" <%= ("zh_CN".equals(locale.toString()) ? "checked" : "") %> id="zh_CN" />
-                </td>
-                <td>
-                    <a href="#" onclick="document.sform.localeCode[1].checked=true; return false;"><img src="images/language_zh_CN.gif" alt="" /></a>
-                </td>
-                <td>
-                    <label for="zh_CN">Simplified Chinese (zh_CN)</label>
-                </td>
-            </tr>
-        </tbody>
-        </table>
+        <c:forEach var="l" items="${locales}">
+            <label for="${l.key}">
+                <input type="radio" name="localeCode" value="${l.key}" ${locale eq l.key ? 'checked' : ''} id="${l.key}"/>
+                <b>${l.value}</b> (${l.key})
+            </label><br>
+        </c:forEach>
 
         <br>
 
diff --git a/xmppserver/src/main/webapp/setup/index.jsp b/xmppserver/src/main/webapp/setup/index.jsp
index 74f3b53b5b..e13412db04 100644
--- a/xmppserver/src/main/webapp/setup/index.jsp
+++ b/xmppserver/src/main/webapp/setup/index.jsp
@@ -17,9 +17,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%@ page import="java.lang.reflect.Method" %>
-<%@ page import="java.util.HashMap"%>
-<%@ page import="java.util.Locale"%>
-<%@ page import="java.util.Map"%>
+<%@ page import="java.util.*"%>
 <%@ page import="org.jivesoftware.util.*" %>
 <%@ page import="java.nio.file.Path" %>
 <%@ page import="java.nio.file.Files" %>
@@ -131,7 +129,8 @@
         }
     }
 
-    Locale locale = JiveGlobals.getLocale();
+    pageContext.setAttribute( "locales", LocaleUtils.getSupportedLocales() );
+    pageContext.setAttribute( "locale", LocaleUtils.bestMatchingSupportedLocale(request.getLocales()) );
     pageContext.setAttribute( "localizedTitle", LocaleUtils.getLocalizedString("title") );
     pageContext.setAttribute( "errors", errors );
 %>
@@ -305,113 +304,14 @@
 
                 <form action="index.jsp" name="sform">
                     <input type="hidden" name="csrf" value="${csrf}">
-                    <%  boolean usingPreset = false;
-                        Locale[] locales = Locale.getAvailableLocales();
-                        for ( final Locale value : locales ) {
-                            usingPreset = value.equals( locale );
-                            if ( usingPreset ) { break; }
-                        }
-
-                        pageContext.setAttribute( "usingPreset", usingPreset );
-                        pageContext.setAttribute( "locale", locale.toString() );
-                    %>
                     <div id="jive-setup-language">
                         <p>
-                            <label for="cs_CZ">
-                                <input type="radio" name="localeCode" value="cs_CZ" ${locale eq 'cs_CZ' ? 'checked' : ''} id="cs_CZ" />
-                                <b>Czech</b> (cs_CZ)
-                            </label><br>
-
-                            <label for="de">
-                                <input type="radio" name="localeCode" value="de" ${locale eq 'de' ? 'checked' : ''} id="de" />
-                                <b>Deutsch</b> (de)
-                            </label><br>
-
-                            <label for="en">
-                                <input type="radio" name="localeCode" value="en" ${locale eq 'en' ? 'checked' : ''} id="en" />
-                                <b>English</b> (en)
-                            </label><br>
-
-                            <label for="es">
-                                <input type="radio" name="localeCode" value="es" ${locale eq 'es' ? 'checked' : ''} id="es" />
-                                <b>Espa&ntilde;ol</b> (es)
-                            </label><br>
-
-                            <label for="fa_IR">
-                                <input type="radio" name="localeCode" value="fa_IR" ${locale eq 'fa_IR' ? 'checked' : ''} id="fa_IR" />
-                                (fa_IR) <b>فارسی</b>
-                            </label><br>
-
-                            <label for="fr">
-                                <input type="radio" name="localeCode" value="fr" ${locale eq 'fr' ? 'checked' : ''} id="fr" />
-                                <b>Fran&ccedil;ais</b> (fr)
-                            </label><br>
-
-                            <label for="he">
-                                <input type="radio" name="localeCode" value="he" ${locale eq 'he' ? 'checked' : ''} id="he" />
-                                (he) <b>עברית</b>
-                            </label><br>
-
-                            <label for="it_IT">
-                                <input type="radio" name="localeCode" value="it_IT" ${locale eq 'it_IT' ? 'checked' : ''} id="it_IT" />
-                                <b>Italiano</b> (it_IT)
-                            </label><br>
-
-                            <label for="ja_JP">
-                                <input type="radio" name="localeCode" value="ja_JP" ${locale eq 'ja_JP' ? 'checked' : ''} id="ja_JP" />
-                                <b>日本語</b> (ja_JP)
-                            </label><br>
-
-                            <label for="nl">
-                                <input type="radio" name="localeCode" value="nl" ${locale eq 'nl' ? 'checked' : ''} id="nl" />
-                                <b>Nederlands</b> (nl)
-                            </label><br>
-
-                            <label for="pl_PL">
-                                <input type="radio" name="localeCode" value="pl_PL" ${locale eq 'pl_PL' ? 'checked' : ''} id="pl_PL" />
-                                <b>Polski</b> (pl_PL)
-                            </label><br>
-
-                            <label for="pt_PT">
-                                <input type="radio" name="localeCode" value="pt_PT" ${locale eq 'pt_PT' ? 'checked' : ''} id="pt_PT" />
-                                <b>Portugu&ecirc;s Portugal</b> (pt_PT)
-                            </label><br>
-
-                            <label for="pt_BR">
-                                <input type="radio" name="localeCode" value="pt_BR" ${locale eq 'pt_BR' ? 'checked' : ''} id="pt_BR" />
-                                <b>Portugu&ecirc;s Brasileiro</b> (pt_BR)
-                            </label><br>
-
-                            <label for="ru_RU">
-                                <input type="radio" name="localeCode" value="ru_RU" ${locale eq 'ru_RU' ? 'checked' : ''} id="ru_RU" />
-                                <b>&#x420;&#x443;&#x441;&#x441;&#x43A;&#x438;&#x439;</b> (ru_RU)
-                            </label><br>
-
-                            <label for="sk">
-                                <input type="radio" name="localeCode" value="sk" ${locale eq 'sk' ? 'checked' : ''} id="sk" />
-                                <b>Sloven&#269;ina</b> (sk)
-                            </label><br>
-
-                            <label for="sv">
-                                <input type="radio" name="localeCode" value="sv" ${locale eq 'sv' ? 'checked' : ''} id="sv" />
-                                <b>Svenska</b> (sv)
-                            </label><br>
-
-                            <label for="tr_TR">
-                                <input type="radio" name="localeCode" value="tr_TR" ${locale eq 'tr_TR' ? 'checked' : ''} id="tr_TR" />
-                                <b>Türkçe</b> (tr_TR)
-                            </label><br>
-
-                            <label for="uk_UA">
-                                <input type="radio" name="localeCode" value="uk_UA" ${locale eq 'uk_UA' ? 'checked' : ''} id="uk_UA" />
-                                <b>Українська</b> (uk_UA)
-                            </label><br>
-
-                            <label for="zh_CN">
-                                <input type="radio" name="localeCode" value="zh_CN" ${locale eq 'zh_CN' ? 'checked' : ''} id="zh_CN" />
-                                <img src="../images/setup_language_zh_CN.gif" align="top" />
-                                <b>Simplified Chinese</b> (zh_CN)
+                        <c:forEach var="l" items="${locales}">
+                            <label for="${l.key}">
+                                <input type="radio" name="localeCode" value="${l.key}" ${locale eq l.key ? 'checked' : ''} id="${l.key}"/>
+                                <b>${l.value}</b> (${l.key})
                             </label><br>
+                        </c:forEach>
                         </p>
                     </div>
 
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/LocaleUtilsTest.java b/xmppserver/src/test/java/org/jivesoftware/util/LocaleUtilsTest.java
index 6186aa5732..fe8f495962 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/LocaleUtilsTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/LocaleUtilsTest.java
@@ -15,18 +15,53 @@
  */
 package org.jivesoftware.util;
 
-import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
 
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Locale;
+
+import static java.util.Arrays.asList;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
 public class LocaleUtilsTest {
 
     @Test
     public void getLocalizedStringWillReturnASensibleDefaultValue() {
-
         final String key = "if.this.key.exists.the.test.will.fail";
+        assertThat(LocaleUtils.getLocalizedString(key), is("???" + key + "???"));
+    }
+
+    @Test
+    public void bestMatchingSupportedLocale() {
+        Enumeration<Locale> reqLocales;
+        String preferredLocale;
+        reqLocales = Collections.enumeration(List.of(
+            new Locale("en")
+        ));
+        preferredLocale = LocaleUtils.bestMatchingSupportedLocale(reqLocales);
+        assertThat(preferredLocale, is("en"));
+
+        reqLocales = Collections.enumeration(List.of(
+            new Locale("en", "US")
+        ));
+        preferredLocale = LocaleUtils.bestMatchingSupportedLocale(reqLocales);
+        assertThat(preferredLocale, is("en"));
+
+        reqLocales = Collections.enumeration(List.of(
+            new Locale("pt", "BR"),
+            new Locale("pt", "PT"),
+            new Locale("pt")
+            ));
+        preferredLocale = LocaleUtils.bestMatchingSupportedLocale(reqLocales);
+        assertThat(preferredLocale, is("pt_BR"));
 
-        MatcherAssert.assertThat(LocaleUtils.getLocalizedString(key), is("???" + key + "???"));
+        reqLocales = Collections.enumeration(List.of(
+            new Locale("pt")
+        ));
+        preferredLocale = LocaleUtils.bestMatchingSupportedLocale(reqLocales);
+        assertThat(preferredLocale, is("pt_PT"));
     }
 }