diff --git a/public/src/admin/general/languages.js b/public/src/admin/general/languages.js
index 8720f96df2..24d6a418c9 100644
--- a/public/src/admin/general/languages.js
+++ b/public/src/admin/general/languages.js
@@ -2,7 +2,11 @@
 /*global define*/
 
 define('admin/general/languages', ['admin/settings'], function(Settings) {
-	$(function() {
+	var Languages = {}
+
+	Languages.init = function() {
 		Settings.prepare();
-	});
+	};
+
+	return Languages;
 });
diff --git a/src/controllers/admin.js b/src/controllers/admin.js
index 91f8310a94..8b1e3f7d35 100644
--- a/src/controllers/admin.js
+++ b/src/controllers/admin.js
@@ -250,6 +250,12 @@ adminController.plugins.get = function(req, res, next) {
 
 adminController.languages.get = function(req, res, next) {
 	languages.list(function(err, languages) {
+		if (err) {
+			return next(err);
+		}
+		languages.forEach(function(language) {
+			language.selected = language.code === meta.config.defaultLang;
+		});
 		res.render('admin/general/languages', {
 			languages: languages
 		});
diff --git a/src/views/admin/general/languages.tpl b/src/views/admin/general/languages.tpl
index b2365e91a3..6075647d77 100644
--- a/src/views/admin/general/languages.tpl
+++ b/src/views/admin/general/languages.tpl
@@ -14,13 +14,13 @@
 						<label for="defaultLang">Default Language</label>
 						<select id="language" data-field="defaultLang" class="form-control">
 							<!-- BEGIN languages -->
-							<option value="{languages.code}">{languages.name} ({languages.code})</option>
+							<option value="{languages.code}" <!-- IF languages.selected -->selected<!-- ENDIF languages.selected -->>{languages.name} ({languages.code})</option>
 							<!-- END languages -->
 						</select>
 					</div>
 				</form>
 
-				
+
 			</div>
 		</div>
 	</div>
@@ -35,6 +35,4 @@
 	</div>
 </div>
 
-<script type="text/javascript">
-$('#language').val(translator.getLanguage());
-</script>
+