diff --git a/mod/directory.php b/mod/directory.php
index 5f00b4f5a..962188945 100755
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -26,6 +26,8 @@ function directory_post(&$a) {
 function directory_content(&$a) {
 
 	$everything = (($a->argc > 1 && $a->argv[1] === 'all' && is_site_admin()) ? true : false);
+	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
+		$everything = false;
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);
diff --git a/mod/regmod.php b/mod/regmod.php
index 76ea4062e..17e728ba2 100755
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -107,7 +107,7 @@ function regmod_content(&$a) {
 		return $o;
 	}
 
-	if(!is_site_admin()) {
+	if((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
 		notice( t('Permission denied.') . EOL);
 		return '';
 	}