diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index cc0a3d617..482bbed78 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -25,7 +25,8 @@ function findpeople_widget() {
 		'$suggest' => t('Channel Suggestions'),
 		'$similar' => '', // FIXME and uncomment when mod/match working // t('Similar Interests'),
 		'$random' => t('Random Profile'),
-		'$inv' => t('Invite Friends')
+		'$inv' => t('Invite Friends'),
+		'$loggedin' => local_user()
 	));
 
 }
diff --git a/mod/directory.php b/mod/directory.php
index 616035339..92fb36ea7 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -11,15 +11,13 @@ function directory_init(&$a) {
 
 function directory_aside(&$a) {
 
-	if(local_user()) {
-		require_once('include/contact_widgets.php');
-		$a->set_widget('find_people',findpeople_widget());
-	}
-
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		return;
 	}
-	
+
+	require_once('include/contact_widgets.php');
+	$a->set_widget('find_people',findpeople_widget());
+
 	$a->set_widget('safe_search',dir_safe_mode());
 
 	$a->set_widget('dir_sort_order',dir_sort_links());
diff --git a/mod/home.php b/mod/home.php
index edcaa938d..3f862b596 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -1,6 +1,6 @@
 <?php
 
-if(! function_exists('home_init')) {
+
 function home_init(&$a) {
 
 	$ret = array();
@@ -20,10 +20,10 @@ function home_init(&$a) {
 		goaway(z_root() . '/new_channel');
 	}
 
-}}
+}
+
 
 
-if(! function_exists('home_content')) {
 function home_content(&$a) {
 
 	$o = '';
@@ -85,4 +85,4 @@ require_once('include/conversation.php');
 	return $o;
 }
 	
-}
+
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index aef341d41..45b3d7d4b 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -7,8 +7,8 @@
 	</form>
 	<br />
 	{{if $similar}}<a href="match" >{{$similar}}</a><br />{{/if}}
-	<a href="suggest" >{{$suggest}}</a><br />
+	{{if $loggedin}}<a href="suggest" >{{$suggest}}</a><br />{{/if}}
 	<a href="randprof" >{{$random}}</a><br />
-	{{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}}
+	{{if $loggedin}}{{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}}{{/if}}
 </div>