diff --git a/root/portal/block/user_menu.php b/root/portal/block/user_menu.php
index 848ae071..3f4e64f9 100644
--- a/root/portal/block/user_menu.php
+++ b/root/portal/block/user_menu.php
@@ -79,7 +79,7 @@ $template->assign_vars(array(
 
 	'U_NEW_POSTS'			=> append_sid($phpbb_root_path . 'search.' . $phpEx . '?search_id=newposts'),
 	'U_SELF_POSTS'			=> append_sid($phpbb_root_path . 'search.' . $phpEx . '?search_id=egosearch'),
-	'U_UM_BOOKMARKS'		=> append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?i=main&mode=bookmarks'),
+	'U_UM_BOOKMARKS'      => ($config['allow_bookmarks']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", "i=main&mode=bookmarks") : '',
 	'U_UM_MAIN_SUBSCRIBED'	=> append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?i=main&mode=subscribed'),
 	'U_PRIVATE_MESSAGES'	=> append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?i=pm&folder=inbox'),
 ));
diff --git a/root/styles/prosilver/template/portal/block/user_menu.html b/root/styles/prosilver/template/portal/block/user_menu.html
index 4537340b..71f5f697 100644
--- a/root/styles/prosilver/template/portal/block/user_menu.html
+++ b/root/styles/prosilver/template/portal/block/user_menu.html
@@ -10,11 +10,18 @@
 				<!-- IF RANK_IMG --><br />{RANK_IMG}<!-- ENDIF -->
 			</div>
 <hr />
+		<!-- IF S_DISPLAY_SEARCH -->
 			<a href="{U_NEW_POSTS}">{L_NEW_POSTS}</a><br />
 			<a href="{U_SELF_POSTS}">{L_SELF_POSTS}</a><br />
+		<!-- ENDIF -->
+		<!-- IF U_UM_BOOKMARKS -->
 			<a href="{U_UM_BOOKMARKS}">{L_UM_BOOKMARKS}</a><br />
+		<!-- ENDIF -->
 			<a href="{U_UM_MAIN_SUBSCRIBED}">{L_UM_MAIN_SUBSCRIBED}</a><br />
-   			<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a><hr />
+		<!-- IF S_DISPLAY_PM -->
+   			<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>
+		<!-- ENDIF -->
+			<hr />
 			<a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a>
 		</div>
 		<span class="corners-bottom"><span></span></span>
diff --git a/templates/subsilver2/template/portal/block/user_menu.html b/templates/subsilver2/template/portal/block/user_menu.html
index de1135ca..d5e641f0 100644
--- a/templates/subsilver2/template/portal/block/user_menu.html
+++ b/templates/subsilver2/template/portal/block/user_menu.html
@@ -10,12 +10,18 @@
 				<!-- IF RANK_TITLE --><br /><small>{RANK_TITLE}</small><!-- ENDIF -->
 				<!-- IF RANK_IMG --><br />{RANK_IMG}<!-- ENDIF -->
 			</div><hr />
-		
+		<!-- IF S_DISPLAY_SEARCH -->
 			<a href="{U_NEW_POSTS}">{L_NEW_POSTS}</a><br />
 			<a href="{U_SELF_POSTS}">{L_SELF_POSTS}</a><br />
+		<!-- ENDIF -->
+		<!-- IF U_UM_BOOKMARKS -->
 			<a href="{U_UM_BOOKMARKS}">{L_UM_BOOKMARKS}</a><br />
+		<!-- ENDIF -->
 			<a href="{U_UM_MAIN_SUBSCRIBED}">{L_UM_MAIN_SUBSCRIBED}</a><br />
-			<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a><hr />
+		<!-- IF S_DISPLAY_PM -->
+			<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>
+		<!-- ENDIF -->
+			<hr />
 			
 			<a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a>
 		</td>