diff --git a/mod/community.php b/mod/community.php
index defc873b..aa5bb726 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -44,23 +44,23 @@ function community_content(&$a, $update = 0) {
 	// Only public posts can be shown
 	// OR your own posts if you are a logged in member
 
-        if(! get_pconfig(local_user(),'system','alt_pager')) {
-	        $r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
-		        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
-		        WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		        AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-		        AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-		        AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
-		        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0"
-	        );
+	if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
+		$r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
+			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+			WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+			AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+			AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
+			AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0"
+		);
 
-	        if(count($r))
-		        $a->set_pager_total($r[0]['total']);
+		if(count($r))
+			$a->set_pager_total($r[0]['total']);
 
-	        if(! $r[0]['total']) {
-		        info( t('No results.') . EOL);
-		        return $o;
-	        }
+		if(! $r[0]['total']) {
+			info( t('No results.') . EOL);
+			return $o;
+		}
 
 	}
 
@@ -91,11 +91,11 @@ function community_content(&$a, $update = 0) {
 
 	$o .= conversation($a,$r,'community',$update);
 
-        if(! get_pconfig(local_user(),'system','alt_pager')) {
-	        $o .= paginate($a);
+	if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
+	        $o .= alt_pager($a,count($r));
 	}
 	else {
-	        $o .= alt_pager($a,count($r));
+	        $o .= paginate($a);
 	}
 
 	return $o;
diff --git a/mod/network.php b/mod/network.php
index 2ab5b6de..2524ae06 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -696,7 +696,7 @@ function network_content(&$a, $update = 0) {
 
 	}
 	else {
-		if(! get_pconfig(local_user(),'system','alt_pager')) {
+		if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
 		        $r = q("SELECT COUNT(*) AS `total`
 			        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			        WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@@ -845,11 +845,11 @@ function network_content(&$a, $update = 0) {
 	$o .= conversation($a,$items,$mode,$update);
 
 	if(! $update) {
-		if(! get_pconfig(local_user(),'system','alt_pager')) {
-		        $o .= paginate($a);
+		if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
+		        $o .= alt_pager($a,count($items));
 		}
 		else {
-		        $o .= alt_pager($a,count($items));
+		        $o .= paginate($a);
 		}
 	}
 
diff --git a/mod/profile.php b/mod/profile.php
index 827166f9..25871c24 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -242,7 +242,7 @@ function profile_content(&$a, $update = 0) {
 			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
 		}
 
-		if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
+		if( (! get_config('alt_pager', 'global')) && (! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) ) {
 		    $r = q("SELECT COUNT(*) AS `total`
 			    FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			    WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@@ -323,12 +323,12 @@ function profile_content(&$a, $update = 0) {
 	$o .= conversation($a,$items,'profile',$update);
 
 	if(! $update) {
-	  if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
-		        $o .= paginate($a);
-	        }
-	        else {
-	                $o .= alt_pager($a,count($items));
-	        }
+		if( get_config('alt_pager', 'global') || get_pconfig($a->profile['profile_uid'],'system','alt_pager') ) {
+			$o .= alt_pager($a,count($items));
+		}
+		else {
+			$o .= paginate($a);
+		}
 	}
 
 	return $o;
diff --git a/mod/search.php b/mod/search.php
index d5727509..956816fe 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -144,7 +144,7 @@ function search_content(&$a) {
 	// OR your own posts if you are a logged in member
 	// No items will be shown if the member has a blocked profile wall. 
 
-	if(! get_pconfig(local_user(),'system','alt_pager')) {
+	if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
 	        $r = q("SELECT distinct(`item`.`uri`) as `total`
 		        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		        WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
@@ -197,11 +197,11 @@ function search_content(&$a) {
 
 	$o .= conversation($a,$r,'search',false);
 
-        if(! get_pconfig(local_user(),'system','alt_pager')) {
-	        $o .= paginate($a);
+	if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
+	        $o .= alt_pager($a,count($r));
 	}
 	else {
-	        $o .= alt_pager($a,count($r));
+	        $o .= paginate($a);
 	}
 
 	return $o;