diff --git a/settings/js/personal.js b/settings/js/personal.js
index 271de1599d9..db18b2861ab 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -86,12 +86,11 @@ $(document).ready(function(){
     });
 
 	$("#languageinput").chosen();
+	// Show only the not selectable optgroup
+	// Choosen only shows optgroup-labels if there are options in the optgroup
+	$(".languagedivider").remove();
 
 	$("#languageinput").change( function(){
-		// the divider is no language
-		if ($("#languageinput option").hasClass('divider')) {
-			return false;
-		}
 		// Serialize the data
 		var post = $( "#languageinput" ).serialize();
 		// Ajax foo
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index c0fcf5c1bd6..67307872058 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -82,7 +82,7 @@ if($_['displayNameChangeSupported']) {
 		<?php foreach($_['commonlanguages'] as $language):?>
 			<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
 		<?php endforeach;?>
-		<option class="divider">––––––––––</option>
+		<optgroup label="––––––––––"><option class="languagedivider">-</option></optgroup>
 		<?php foreach($_['languages'] as $language):?>
 			<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
 		<?php endforeach;?>