diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index f118d330ba..c25925a9c8 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -777,9 +777,9 @@ INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogg');
 INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogm');
 
 # User Notification Options (for first user)
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_post', 0, 2, '');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_post', 0, 2, 'phpbb_notification_method_email');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_topic', 0, 2, '');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_topic', 0, 2, 'phpbb_notification_method_email');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('post', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('post', 0, 2, 'email');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('topic', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('topic', 0, 2, 'email');
 
 # POSTGRES COMMIT #
diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php
new file mode 100644
index 0000000000..ec495da602
--- /dev/null
+++ b/tests/functional/notification_test.php
@@ -0,0 +1,56 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_notification_test extends phpbb_functional_test_case
+{
+	static public function user_subscription_data()
+	{
+		return array(
+			// Rows inserted by phpBB/install/schemas/schema_data.sql
+			// Also see PHPBB3-11460
+			array('post_notification', true),
+			array('topic_notification', true),
+			array('post_email', true),
+			array('topic_email', true),
+
+			// Default behaviour for in-board notifications:
+			// If user did not opt-out, in-board notifications are on.
+			array('bookmark_notification', true),
+			array('quote_notification', true),
+
+			// Default behaviour for email notifications:
+			// If user did not opt-in, email notifications are off.
+			array('bookmark_email', false),
+			array('quote_email', false),
+		);
+	}
+
+	/**
+	* @dataProvider user_subscription_data
+	*/
+	public function test_user_subscriptions($checkbox_name, $expected_status)
+	{
+		$this->login();
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options');
+		$this->assert_response_success();
+
+		$cplist = $crawler->filter('.cplist');
+		if ($expected_status)
+		{
+			$this->assert_checkbox_is_checked($cplist, $checkbox_name);
+		}
+		else
+		{
+			$this->assert_checkbox_is_unchecked($cplist, $checkbox_name);
+		}
+	}
+}
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 887dfea3b5..a411d9c98a 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -196,12 +196,12 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$parseURL = parse_url(self::$config['phpbb_functional_url']);
 
 		$data = array_merge($data, array(
-			'email_enable'		=> false,
-			'smtp_delivery'		=> false,
-			'smtp_host'		=> '',
-			'smtp_auth'		=> '',
-			'smtp_user'		=> '',
-			'smtp_pass'		=> '',
+			'email_enable'		=> true,
+			'smtp_delivery'		=> true,
+			'smtp_host'			=> 'nxdomain.phpbb.com',
+			'smtp_auth'			=> '',
+			'smtp_user'			=> 'nxuser',
+			'smtp_pass'			=> 'nxpass',
 			'cookie_secure'		=> false,
 			'force_server_vars'	=> false,
 			'server_protocol'	=> $parseURL['scheme'] . '://',
@@ -463,4 +463,68 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$this->assertGreaterThan(0, count($nodes), $msg);
 		return $nodes;
 	}
+
+	/**
+	* Asserts that exactly one checkbox with name $name exists within the scope
+	* of $crawler and that the checkbox is checked.
+	*
+	* @param Symfony\Component\DomCrawler\Crawler $crawler
+	* @param string $name
+	* @param string $message
+	*
+	* @return null
+	*/
+	public function assert_checkbox_is_checked($crawler, $name, $message = '')
+	{
+		$this->assertSame(
+			'checked',
+			$this->assert_find_one_checkbox($crawler, $name)->attr('checked'),
+			$message ?: "Failed asserting that checkbox $name is checked."
+		);
+	}
+
+	/**
+	* Asserts that exactly one checkbox with name $name exists within the scope
+	* of $crawler and that the checkbox is unchecked.
+	*
+	* @param Symfony\Component\DomCrawler\Crawler $crawler
+	* @param string $name
+	* @param string $message
+	*
+	* @return null
+	*/
+	public function assert_checkbox_is_unchecked($crawler, $name, $message = '')
+	{
+		$this->assertSame(
+			'',
+			$this->assert_find_one_checkbox($crawler, $name)->attr('checked'),
+			$message ?: "Failed asserting that checkbox $name is unchecked."
+		);
+	}
+
+	/**
+	* Searches for an input element of type checkbox with the name $name using
+	* $crawler. Contains an assertion that only one such checkbox exists within
+	* the scope of $crawler.
+	*
+	* @param Symfony\Component\DomCrawler\Crawler $crawler
+	* @param string $name
+	* @param string $message
+	*
+	* @return Symfony\Component\DomCrawler\Crawler
+	*/
+	public function assert_find_one_checkbox($crawler, $name, $message = '')
+	{
+		$query = sprintf('//input[@type="checkbox" and @name="%s"]', $name);
+		$result = $crawler->filterXPath($query);
+
+		$this->assertEquals(
+			1,
+			sizeof($result),
+			$message ?: 'Failed asserting that exactly one checkbox with name' .
+				" $name exists in crawler scope."
+		);
+
+		return $result;
+	}
 }