diff --git a/includes/User.php b/includes/User.php
index 1e3809d1414..551aa23c369 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1511,7 +1511,7 @@ class User {
 		$confstr =        $this->getOption( 'math' );
 		$confstr .= '!' . $this->getOption( 'stubthreshold' );
 		$confstr .= '!' . $this->getOption( 'date' );
-		$confstr .= '!' . $this->getOption( 'numberheadings' );
+		$confstr .= '!' . ($this->getOption( 'numberheadings' ) ? '1' : '');
 		$confstr .= '!' . $this->getOption( 'language' );
 		$confstr .= '!' . $this->getOption( 'thumbsize' );
 		// add in language specific options, if any
diff --git a/languages/Language.php b/languages/Language.php
index 0003b795c06..63791cf34b5 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -81,7 +81,8 @@ if(isset($wgExtraNamespaces)) {
 	'fancysig' 		=> 0,
 	'externaleditor' 	=> 0,
 	'externaldiff' 		=> 0,
-	'showjumplinks' 		=> 1,
+	'showjumplinks'		=> 1,
+	'numberheadings'	=> 0,
 );
 
 /* private */ $wgQuickbarSettingsEn = array(