diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 6889858299..0f67911fb9 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -396,8 +396,9 @@ switch ($mode)
 			'S_CUSTOM_FIELDS'	=> (isset($profile_fields['row']) && sizeof($profile_fields['row'])) ? true : false,
 			'S_SHOW_ACTIVITY'	=> ($config['load_user_activity']) ? true : false,
 
-			'U_ADD_FRIEND'		=> "ucp.$phpEx$SID&i=zebra&add=" . urlencode($member['username']),
-			'U_ADD_FOE'			=> "ucp.$phpEx$SID&i=zebra&mode=foes&add=" . urlencode($member['username']))
+			'S_ZEBRA'			=> ($user->data['user_id'] != $user_id && $user->data['is_registered']) ? true : false,
+			'U_ADD_FRIEND'		=> "{$phpbb_root_path}ucp.$phpEx$SID&i=zebra&add=" . urlencode($member['username']),
+			'U_ADD_FOE'			=> "{$phpbb_root_path}ucp.$phpEx$SID&i=zebra&mode=foes&add=" . urlencode($member['username']))
 		);
 
 		if (isset($profile_fields['row']) && sizeof($profile_fields['row']))
diff --git a/phpBB/styles/subSilver/template/memberlist_view.html b/phpBB/styles/subSilver/template/memberlist_view.html
index 5ec4aa31c5..8f2ac04810 100644
--- a/phpBB/styles/subSilver/template/memberlist_view.html
+++ b/phpBB/styles/subSilver/template/memberlist_view.html
@@ -35,7 +35,7 @@
 					<tr>
 						<td align="center">{ONLINE_IMG}</td>
 					</tr>
-					<!-- IF S_USER_LOGGED_IN -->
+					<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->
 					<tr>
 						<td class="genmed" align="center">[ <a href="{U_ADD_FRIEND}">{L_ADD_FRIEND}</a> | <a href="{U_ADD_FOE}">{L_ADD_FOE}</a> ]</td>
 					</tr>