1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 6812cd59b9..2d47134538 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -292,6 +292,12 @@ if ($module->is_active('zebra', 'friends'))
 	$db->sql_freeresult($result);
 }
 
+// Do not display subscribed topics/forums if not allowed
+if (!$config['allow_topic_notify'] && !$config['allow_forum_notify'])
+{
+	$module->set_display('main', 'subscribed', false);
+}
+
 // Select the active module
 $module->set_active($id, $mode);