diff --git a/install/data/defaults.json b/install/data/defaults.json
index c471db6b89..86e63882cd 100644
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -35,5 +35,6 @@
     "allowPrivateGroups": 1,
     "unreadCutoff": 2,
     "bookmarkThreshold": 5,
-    "topicsPerList": 20
+    "topicsPerList": 20,
+    "autoDetectLang": 1
 }
diff --git a/public/language/en-GB/admin/general/languages.json b/public/language/en-GB/admin/general/languages.json
index da45cade2c..bdd57849b3 100644
--- a/public/language/en-GB/admin/general/languages.json
+++ b/public/language/en-GB/admin/general/languages.json
@@ -1,5 +1,6 @@
 {
 	"language-settings": "Language Settings",
 	"description": "The default language determines the language settings for all users who are visiting your forum. <br />Individual users can override the default language on their account settings page.",
-	"default-language": "Default Language"
+	"default-language": "Default Language",
+	"auto-detect": "Auto Detect Language Setting for Guests"
 }
\ No newline at end of file
diff --git a/src/controllers/admin/languages.js b/src/controllers/admin/languages.js
index 0ac4e98e99..e2d848ddae 100644
--- a/src/controllers/admin/languages.js
+++ b/src/controllers/admin/languages.js
@@ -18,6 +18,7 @@ languagesController.get = function (req, res, next) {
 
 		res.render('admin/general/languages', {
 			languages: languages,
+			autoDetectLang: parseInt(meta.config.autoDetectLang, 10) === 1,
 		});
 	});
 };
diff --git a/src/views/admin/general/languages.tpl b/src/views/admin/general/languages.tpl
index 310d1a366d..747c5d43af 100644
--- a/src/views/admin/general/languages.tpl
+++ b/src/views/admin/general/languages.tpl
@@ -16,6 +16,17 @@
 					</select>
 				</div>
 			</form>
+
+			<form class="row">
+				<div class="form-group col-sm-6">
+					<div class="checkbox">
+						<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
+							<input class="mdl-switch__input" type="checkbox" data-field="autoDetectLang" <!-- IF autoDetectLang -->checked<!-- ENDIF autoDetectLang -->/>
+							<span class="mdl-switch__label">[[admin/general/languages:auto-detect]]</span>
+						</label>
+					</div>
+				</div>
+			</form>
 		</div>
 	</div>
 </div>
diff --git a/src/webserver.js b/src/webserver.js
index 3911846b67..412378883c 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -206,7 +206,7 @@ function setupAutoLocale(app, callback) {
 		});
 
 		app.use(function (req, res, next) {
-			if (parseInt(req.uid, 10) > 0) {
+			if (parseInt(req.uid, 10) > 0 || parseInt(meta.config.autoDetectLang, 10) !== 1) {
 				return next();
 			}