diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index 692c1d63..bbafbafd 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -456,7 +456,7 @@ function buildUploadAccounts($scope, $data, $ids) {
 		}
 		if ($newRound) continue;
 		// this point should never be reached, LAM was unable to find a correct module order
-		StatusMessage("ERROR", _("Internal Error: Unable to find correct module order."), "");
+		StatusMessage("ERROR", "Internal Error: Unable to find correct module order.", "");
 		return false;
 	}
 	// give raw data to modules
diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc
index 612cd6e9..074032a4 100644
--- a/lam/lib/modules/posixGroup.inc
+++ b/lam/lib/modules/posixGroup.inc
@@ -254,7 +254,7 @@ class posixGroup extends baseModule {
 		'descriptions' => array(
 		'posixGroup_minGID' => _("Minimum GID number for Unix groups"),
 		'posixGroup_maxGID' => _("Maximum GID number for Unix groups"),
-		'posixGroup_pwdHash' => _("Password hash type"),
+		'posixGroup_pwdHash' => _("Password hash type for Unix groups"),
 		)
 		);
 		// configuration checks
diff --git a/lam/lib/modules/sambaGroupMapping.inc b/lam/lib/modules/sambaGroupMapping.inc
index 3794a732..50876ea9 100644
--- a/lam/lib/modules/sambaGroupMapping.inc
+++ b/lam/lib/modules/sambaGroupMapping.inc
@@ -336,7 +336,7 @@ class sambaGroupMapping extends baseModule {
 	function load_Messages() {
 		$this->messages['sambaSID'][0] = array('ERROR', _('Special Group'),sprintf( _('There can be only one group %s.'), $rids[$i]), 'sambaSID');
 		$this->messages['sambaSID'][1] = array('ERROR', _("Account %s") . " (sambaGroupMapping_domain): " . _("LAM was unable to find a Samba 3 domain with this name!"));  // third parameter must be set dynamically
-		$this->messages['groupType'][0] = array('ERROR', _("Account %s") . "(sambaGroupMapping_type): " . _("This is not a valid Samba 3 group type!"), _("Possible values:") . " %s");
+		$this->messages['groupType'][0] = array('ERROR', _("Account %s") . "(sambaGroupMapping_type): " . _("This is not a valid Samba 3 group type!"), _("Possible values") . ": %s");
 	}
 
 
diff --git a/lam/lib/modules/shadowAccount.inc b/lam/lib/modules/shadowAccount.inc
index 8c70da9e..cf9a73b1 100644
--- a/lam/lib/modules/shadowAccount.inc
+++ b/lam/lib/modules/shadowAccount.inc
@@ -38,7 +38,7 @@ class shadowAccount extends baseModule {
 		// error messages for input checks
 		$this->messages['shadowMin'][0] = array('ERROR', _('Password minage'), _('Password minage must be are natural number.'));
 		$this->messages['shadowMax'][0] = array('ERROR', _('Password maxage'), _('Password maxage must be are natural number.'));
-		$this->messages['inactive'][0] = array('ERROR', _('Password Expire'), _('Password expire must be are natural number or -1.'));
+		$this->messages['inactive'][0] = array('ERROR', _('Password expire'), _('Password expire must be are natural number or -1.'));
 		$this->messages['shadowWarning'][0] = array('ERROR', _('Password warn'), _('Password warn must be are natural number.'));
 		$this->messages['shadow_cmp'][0] = array('ERROR', _('Password maxage'), _('Password maxage must bigger as Password Minage.'));
 	}
diff --git a/lam/templates/lists/listgroups.php b/lam/templates/lists/listgroups.php
index 22c80d72..27f750ca 100644
--- a/lam/templates/lists/listgroups.php
+++ b/lam/templates/lists/listgroups.php
@@ -308,7 +308,7 @@ if (sizeof($grp_info) > 0) {
 	echo ("<input type=\"submit\" name=\"del_group\" value=\"" . _("Delete Group(s)") . "\">\n");
 	echo ("<br><br><br>\n");
 	echo "<fieldset><legend><b>PDF</b></legend>\n";
-	echo ("<b>" . _('PDF structure:') . "</b>&nbsp;&nbsp;<select name=\"pdf_structure\">\n");
+	echo ("<b>" . _('PDF structure') . ":</b>&nbsp;&nbsp;<select name=\"pdf_structure\">\n");
 	$pdf_structures = getAvailablePDFStructures('group');
 	foreach($pdf_structures as $pdf_structure) {
 		echo "<option value=\"" . $pdf_structure . "\"" . (($pdf_structure == 'default.xml') ? " selected" : "") . ">" . substr($pdf_structure,0,strlen($pdf_structure)-4) . "</option>";
diff --git a/lam/templates/lists/listhosts.php b/lam/templates/lists/listhosts.php
index 452ce9e7..e6f7c3fd 100644
--- a/lam/templates/lists/listhosts.php
+++ b/lam/templates/lists/listhosts.php
@@ -293,7 +293,7 @@ if (sizeof($hst_info) > 0) {
 	echo ("<input type=\"submit\" name=\"del_host\" value=\"" . _("Delete Host(s)") . "\">\n");
 	echo ("<br><br><br>\n");
 	echo "<fieldset><legend><b>PDF</b></legend>\n";
-	echo ("<b>" . _('PDF structure:') . "</b>&nbsp;&nbsp;<select name=\"pdf_structure\">\n");
+	echo ("<b>" . _('PDF structure') . ":</b>&nbsp;&nbsp;<select name=\"pdf_structure\">\n");
 	$pdf_structures = getAvailablePDFStructures('host');
 	foreach($pdf_structures as $pdf_structure) {
 		echo "<option value=\"" . $pdf_structure . "\"" . (($pdf_structure == 'default.xml') ? " selected" : "") . ">" . substr($pdf_structure,0,strlen($pdf_structure)-4) . "</option>";
diff --git a/lam/templates/lists/listusers.php b/lam/templates/lists/listusers.php
index 1c86d902..4a86f6f0 100644
--- a/lam/templates/lists/listusers.php
+++ b/lam/templates/lists/listusers.php
@@ -356,7 +356,7 @@ if ($user_count != 0) {
 	echo ("<input type=\"submit\" name=\"del_user\" value=\"" . _("Delete user(s)") . "\">\n");
 	echo ("<br><br><br>\n");
 	echo "<fieldset><legend><b>PDF</b></legend>\n";
-	echo ("<b>" . _('PDF structure:') . "</b>&nbsp;&nbsp;<select name=\"pdf_structure\">\n");
+	echo ("<b>" . _('PDF structure') . ":</b>&nbsp;&nbsp;<select name=\"pdf_structure\">\n");
 	$pdf_structures = getAvailablePDFStructures('user');
 	foreach($pdf_structures as $pdf_structure) {
 		echo "<option value=\"" . $pdf_structure . "\"" . (($pdf_structure == 'default.xml') ? " selected" : "") . ">" . substr($pdf_structure,0,strlen($pdf_structure)-4) . "</option>";