diff --git a/src/octoprint/cli/config.py b/src/octoprint/cli/config.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index 14009965..f7b63ec6 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -575,6 +575,9 @@ class Server(object):
 		if "l10n" in request.values:
 			return Locale.negotiate([request.values["l10n"]], LANGUAGES)
 
+		if "X-Locale" in request.headers:
+			return Locale.negotiate([request.headers["X-Locale"]], LANGUAGES)
+
 		if hasattr(g, "identity") and g.identity and userManager.enabled:
 			userid = g.identity.id
 			try: