diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index a1ca955ee1..ebfc0c7c71 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -89,7 +89,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 			$messenger->assign_vars(array_merge(array(
 				'USERNAME'						=> $user['username'],
 
-				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=notifications', // todo Update URL
+				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications',
 			), $notification->get_email_template_variables()));
 
 			$messenger->send($this->notify_method);
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index bf41d2b05e..e47ddafe1d 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -86,10 +86,6 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$users = array();
 
-		/* todo
-		* find what type of notification they'd like to receive
-		* make sure not to send duplicate notifications
-		*/
 		$sql = 'SELECT user_id
 			FROM ' . TOPICS_WATCH_TABLE . '
 			WHERE topic_id = ' . (int) $post['topic_id'] . '