diff --git a/src/controllers/admin.js b/src/controllers/admin.js
index 2eac244d78..72bfa2b14a 100644
--- a/src/controllers/admin.js
+++ b/src/controllers/admin.js
@@ -203,7 +203,9 @@ adminController.languages.get = function(req, res, next) {
 };
 
 adminController.settings.get = function(req, res, next) {
-	res.render('admin/settings/' + req.params.term, {
+	var term = req.params.term ? req.params.term : 'general';
+
+	res.render('admin/settings/' + term, {
 		'csrf': req.csrfToken()
 	});
 };
diff --git a/src/routes/admin.js b/src/routes/admin.js
index a29610e0e2..aede9d6ce7 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -45,7 +45,7 @@ function addRoutes(router, middleware, controllers) {
 	router.get('/sounds', controllers.admin.sounds.get);
 
 	//settings
-	router.get('/settings/:term', middleware.applyCSRF, controllers.admin.settings.get);
+	router.get('/settings/:term?', middleware.applyCSRF, controllers.admin.settings.get);
 
 	//user
 	router.get('/users', controllers.admin.users.search);