diff --git a/src/psm/Module/AbstractController.class.php b/src/psm/Module/AbstractController.class.php
index 1bc7a41e..f7ea5b02 100755
--- a/src/psm/Module/AbstractController.class.php
+++ b/src/psm/Module/AbstractController.class.php
@@ -221,10 +221,10 @@ abstract class AbstractController implements ControllerInterface {
 
 		switch($ulvl) {
 			case PSM_USER_ADMIN:
-				$items = array('server', 'user', 'server_log', 'server_status', 'config', 'server_update');
+				$items = array('server', 'server_status', 'server_log', 'user', 'config', 'server_update');
 				break;
 			case PSM_USER_USER:
-				$items = array('server', 'server_log', 'server_status', 'server_update');
+				$items = array('server', 'server_status', 'server_log', 'server_update');
 				break;
 			default:
 				$items = array();
diff --git a/src/psm/Module/Server/Controller/LogController.class.php b/src/psm/Module/Server/Controller/LogController.class.php
index e93bb1cd..c4f72b96 100755
--- a/src/psm/Module/Server/Controller/LogController.class.php
+++ b/src/psm/Module/Server/Controller/LogController.class.php
@@ -133,7 +133,7 @@ class LogController extends AbstractController {
 		$this->tpl->addTemplateData(
 			$this->getTemplateId(),
 			array(
-				'subtitle' => psm_get_lang('system', 'server_log'),
+				'subtitle' => psm_get_lang('menu', 'server_log'),
 				'label_status' => psm_get_lang('log', 'status'),
 				'label_email' => psm_get_lang('log', 'email'),
 				'label_sms' => psm_get_lang('log', 'sms'),
diff --git a/src/psm/Module/Server/Controller/ServerController.class.php b/src/psm/Module/Server/Controller/ServerController.class.php
index f066bd38..3dcbdf5f 100755
--- a/src/psm/Module/Server/Controller/ServerController.class.php
+++ b/src/psm/Module/Server/Controller/ServerController.class.php
@@ -239,7 +239,7 @@ class ServerController extends AbstractController {
 		$this->tpl->addTemplateData(
 			$this->getTemplateId(),
 			array(
-				'subtitle' => psm_get_lang('menu', 'servers'),
+				'subtitle' => psm_get_lang('menu', 'server'),
 				'label_label' => psm_get_lang('servers', 'label'),
 				'label_domain' => psm_get_lang('servers', 'domain'),
 				'label_port' => psm_get_lang('servers', 'port'),
diff --git a/src/psm/Module/Server/Controller/StatusController.class.php b/src/psm/Module/Server/Controller/StatusController.class.php
index ae8cc94b..a17d061e 100755
--- a/src/psm/Module/Server/Controller/StatusController.class.php
+++ b/src/psm/Module/Server/Controller/StatusController.class.php
@@ -96,7 +96,7 @@ class StatusController extends AbstractController {
 		$this->tpl->addTemplateData(
 			$this->getTemplateId(),
 			array(
-				'subtitle' => psm_get_lang('menu', 'status'),
+				'subtitle' => psm_get_lang('menu', 'server_status'),
 			)
 		);
 
diff --git a/src/psm/Module/User/Controller/UserController.class.php b/src/psm/Module/User/Controller/UserController.class.php
index f41d4a96..f570a266 100755
--- a/src/psm/Module/User/Controller/UserController.class.php
+++ b/src/psm/Module/User/Controller/UserController.class.php
@@ -258,7 +258,7 @@ class UserController extends AbstractController {
 		$this->tpl->addTemplateData(
 			$this->getTemplateId(),
 			array(
-				'subtitle' => psm_get_lang('menu', 'users'),
+				'subtitle' => psm_get_lang('menu', 'user'),
 				'label_users' => psm_get_lang('menu', 'users'),
 				'label_name' => psm_get_lang('users', 'name'),
 				'label_user_name' => psm_get_lang('users', 'user_name'),