diff --git a/upload/source/include/spacecp/spacecp_friend.php b/upload/source/include/spacecp/spacecp_friend.php
index 794943823a1974259d12a9955525f21d808b937a..c55e77651969a7f8da1843b0469153719ddabdfa 100644
--- a/upload/source/include/spacecp/spacecp_friend.php
+++ b/upload/source/include/spacecp/spacecp_friend.php
@@ -340,7 +340,7 @@ if($op == 'add') {
 	if($page<1) $page = 1;
 	$start = ($page-1)*$perpage;
 
-	$list = array();
+	$list = $ols = array();
 
 	$count = C::t('home_friend_request')->count_by_uid($space['uid']);
 	if($count) {
@@ -349,9 +349,16 @@ if($op == 'add') {
 			$fuids[$value['fuid']] = $value['fuid'];
 			$list[$value['fuid']] = $value;
 		}
+		if (!empty($fuids)) {
+			foreach(C::app()->session->fetch_all_by_uid($fuids) as $value) {
+				if(!$value['invisible']) {
+					$ols[$value['uid']] = 1;
+				}
+			}
+		}		
 	} else {
 
-		dsetcookie('promptstate_'.$space['uid'], $newprompt, 31536000);
+		dsetcookie('promptstate_'.$space['uid'], $space['newprompt'], 31536000);
 
 	}
 
diff --git a/upload/source/include/spacecp/spacecp_search.php b/upload/source/include/spacecp/spacecp_search.php
index 76e00a2ddd3c3b4522578ef711e4aae9f846d65b..79efb76f1b93acd760daffef8b41b1b38b0227ce 100644
--- a/upload/source/include/spacecp/spacecp_search.php
+++ b/upload/source/include/spacecp/spacecp_search.php
@@ -84,7 +84,7 @@ if(!empty($_GET['searchsubmit']) || !empty($_GET['searchmode'])) {
 		$wherearr['profile'] = "sf.uid=s.uid";
 	}
 
-	$list = array();
+	$list = $ols = array();
 	if($wherearr) {
 
 		$space['friends'] = array();
@@ -101,6 +101,13 @@ if(!empty($_GET['searchsubmit']) || !empty($_GET['searchmode'])) {
 		foreach($list as $uid => $value) {
 			$list[$uid]['follow'] = isset($follows[$uid]) ? 1 : 0;
 		}
+		if (!empty($list)) {
+			foreach(C::app()->session->fetch_all_by_uid(array_keys($list)) as $value) {
+				if(!$value['invisible']) {
+					$ols[$value['uid']] = 1;
+				}
+			}
+		}		
 	}