diff --git a/interface/web/help/lib/module.conf.php b/interface/web/help/lib/module.conf.php
index 06144a14eab41aa7471dbff21217d94bb070c758..b99280edc7aa6deb80d966e62162684953f490ed 100644
--- a/interface/web/help/lib/module.conf.php
+++ b/interface/web/help/lib/module.conf.php
@@ -10,10 +10,15 @@ $module['title']     = 'top_menu_help';
 $module['template']  = 'module.tpl.htm';
 
 //* The page that is displayed when the module is loaded. the path must is relative to the web directory
-if(isset($_GET['go2_faq_sections_list']))
+if(isset($_GET['go2_faq_sections_list'])){
 	$module['startpage'] = 'help/faq_sections_list.php';
-else
-	$module['startpage'] = 'help/version.php';
+} else {
+	if($_SESSION['s']['user']['typ'] == 'admin') {
+		$module['startpage'] = 'help/version.php';
+	} else {
+		$module['startpage'] = 'help/support_message_list.php';
+	}
+}
 
 //* The width of the tab. Normally you should leave this empty and let the browser define the width automatically.
 $module['tab_width'] = '';
@@ -52,24 +57,28 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
 	$itemsfaq[] = array( 	'title'		=> 'Manage Sections',
 							'target'	=> 'content',
 							'link'		=> 'help/faq_sections_list.php');
+							
+	$module['nav'][] = array( 	'title'	=> 'FAQ',
+								'open'	=> 1,
+								'items'	=> $itemsfaq);
 }
 else
 { //* the user
 	$sql = "SELECT * FROM help_faq_sections";
 	$res = $app->db->queryAllRecords($sql);
 	//* all the content sections
-	if(is_array($res)) {
+	if(is_array($res) && !empty($res)) {
 		foreach($res as $v) {
 			$itemsfaq[] = array( 	'title'		=> $v['hfs_name'],
 									'target'	=> 'content',
 									'link'		=> 'help/faq_list.php?hfs_id='.$v['hfs_id']);
 		}
+		// Display 'FAQ' menu only if there are sections
+		$module['nav'][] = array( 	'title'	=> 'FAQ',
+									'open'	=> 1,
+									'items'	=> $itemsfaq);
 	}
 }
-
-$module['nav'][] = array( 	'title'	=> 'FAQ',
-							'open'	=> 1,
-							'items'	=> $itemsfaq);
 //* -- end of the FAQ menu section
 
 
diff --git a/interface/web/help/version.php b/interface/web/help/version.php
index e53143c215292acceef75a58290e6bcae6490c57..dc0577e4a491526639f02c8d146b86e888798e4c 100644
--- a/interface/web/help/version.php
+++ b/interface/web/help/version.php
@@ -43,8 +43,10 @@ require_once('../../lib/config.inc.php');
 require_once('../../lib/app.inc.php');
 
 //* Check permissions for module
-$app->auth->check_module_permissions('admin');
+$app->auth->check_module_permissions('help');
 
-echo '<p>&nbsp;</p><p>&nbsp;</p><p class="frmTextHead" style="text-align:center;">'.$app->lng('ISPConfig Version:').' '.ISPC_APP_VERSION.'</p>';
+if($_SESSION['s']['user']['typ'] == 'admin') {
+	echo '<p>&nbsp;</p><p>&nbsp;</p><p class="frmTextHead" style="text-align:center;">'.$app->lng('ISPConfig Version:').' '.ISPC_APP_VERSION.'</p>';
+}
 
 ?>
\ No newline at end of file