diff --git a/public/templates/admin/languages.tpl b/public/templates/admin/languages.tpl
index 107712c424..3c4a266e6b 100644
--- a/public/templates/admin/languages.tpl
+++ b/public/templates/admin/languages.tpl
@@ -5,8 +5,8 @@
 	<p>
 		The following setting(s) determine the language settings for your NodeBB.
 		The default language determines the language settings for all users who
-		are visiting your NodeBB. Keep in mind that individual users may decide
-		to switch languages for their own accounts.
+		are visiting your NodeBB. <!-- Keep in mind that individual users may decide
+		to switch languages for their own accounts. -->
 	</p>
 
 	<form class="row">
@@ -14,7 +14,7 @@
 			<label for="defaultLang">Default Language</label>
 			<select data-field="defaultLang" class="form-control">
 				<!-- BEGIN languages -->
-				<option value="{languages.code}">{languages.name}</option>
+				<option value="{languages.code}">{languages.name} ({languages.code})</option>
 				<!-- END languages -->
 			</select>
 		</div>
diff --git a/src/languages.js b/src/languages.js
index 3ba42b3b6e..394fca21b1 100644
--- a/src/languages.js
+++ b/src/languages.js
@@ -32,14 +32,14 @@ Languages.list = function(callback) {
 				}
 			});
 		}, function(err) {
-			// Float "en" to the top
+			// Float "en" to the top, otherwise sort alphabetically
 			languages = languages.sort(function(a, b) {
 				if (a.code === 'en') {
 					return -1;
 				} else if (b.code === 'en') {
 					return 1;
 				} else {
-					return 0;
+					return a.code > b.code;
 				}
 			});