diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php
index 01024175e7..0aa6d7a9c1 100644
--- a/phpBB/admin/admin_smilies.php
+++ b/phpBB/admin/admin_smilies.php
@@ -439,7 +439,7 @@ function update_smile_dimensions()
 	</tr>
 	<tr>
 		<td class="row1"><?php echo $user->lang['Display_on_posting'] ?></td>
-		<td class="row1"><input type="checkbox" name="smile_on_posting" <?php echo ($smile_data['smile_on_posting']) ? ' checked="checked"' : '' ?>/></td>
+		<td class="row1"><input type="checkbox" name="display_on_posting" <?php echo ($smile_data['display_on_posting']) ? ' checked="checked"' : '' ?>/></td>
 	</tr>
 	<tr>
 		<td class="row2"><?php echo $user->lang['Smile_order'] ?></td>
@@ -472,7 +472,7 @@ function update_smile_dimensions()
 			'smile_height'		=>	$smile_height,
 			'smile_order'		=>	$smile_order,
 			'emoticon'			=>	stripslashes($_POST['smile_emotion']),
-			'smile_on_posting'	=>	(!empty($_POST['smile_on_posting'])) ? 1 : 0
+			'display_on_posting'	=>	(!empty($_POST['display_on_posting'])) ? 1 : 0
 		);
 
 		$smile_id = $_POST['smile_id'];
@@ -556,7 +556,7 @@ function update_smile_dimensions()
 
 		$sql = 'SELECT *
 				FROM ' . SMILIES_TABLE . '
-				ORDER BY smile_on_posting DESC, smile_order ASC';
+				ORDER BY display_on_posting DESC, smile_order ASC';
 		$result = $db->sql_query($sql);
 		page_header($user->lang['Emoticons']);
 ?>
@@ -594,7 +594,7 @@ function update_smile_dimensions()
 		$spacer = FALSE;
 		while ($row = $db->sql_fetchrow($result))
 		{
-			if (!$spacer && !$row['smile_on_posting'])
+			if (!$spacer && !$row['display_on_posting'])
 			{
 				$spacer = TRUE;
 ?>
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index e195791445..61bcd9a0fc 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -480,7 +480,7 @@ function generate_smilies($mode)
 		);
 	}
 
-	$where_sql = ( $mode == 'inline' ) ? 'WHERE smile_on_posting = 1 ' : '';
+	$where_sql = ( $mode == 'inline' ) ? 'WHERE display_on_posting = 1 ' : '';
 	$sql = "SELECT emoticon, code, smile_url, smile_width, smile_height
 		FROM " . SMILIES_TABLE . "
 		$where_sql
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index c0e216906d..a1272438f2 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -415,7 +415,7 @@ CREATE TABLE phpbb_smilies (
    smile_height tinyint(4) UNSIGNED NOT NULL,
    smile_order tinyint(4) UNSIGNED NOT NULL,
    emoticon char(50),
-   smile_on_posting tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+   display_on_posting tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
    PRIMARY KEY (smilies_id)
 );