diff --git a/lam/lib/modules/asteriskAccount.inc b/lam/lib/modules/asteriskAccount.inc
index 9fb9235f..ac638f4a 100644
--- a/lam/lib/modules/asteriskAccount.inc
+++ b/lam/lib/modules/asteriskAccount.inc
@@ -99,7 +99,7 @@ class asteriskAccount extends baseModule implements passwordService {
 		// config options	
 		$return['config_options']['user'] = array(
 			array(
-				array('kind' => 'text', 'text' => '<b>' . _("Users") . ': &nbsp;</b>' . _('Asterisk realm') . ": "),
+				array('kind' => 'text', 'text' => _('Asterisk realm')),
 				array('kind' => 'input', 'name' => 'asteriskAccount_AsteriskRealm', 'type' => 'text', 'size' => '30', 'maxlength' => '255'),
 				array('kind' => 'help', 'value' => 'AsteriskRealm')
 			)
diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index eef3088b..bda2905e 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -159,25 +159,25 @@ class posixAccount extends baseModule implements passwordService {
 		// configuration options
 		$return['config_options']['user'] = array(
 			array(
-				array('kind' => 'text', 'text' => '<b>' . _("Users") . ': &nbsp;</b>' . _('Minimum UID number') . "*: "),
+				array('kind' => 'text', 'text' => '<b>' . _("Users") . ': &nbsp;</b>' . _('Minimum UID number') . "* "),
 				array('kind' => 'input', 'name' => 'posixAccount_minUID', 'type' => 'text', 'size' => '10', 'maxlength' => '255'),
 				array('kind' => 'text', 'value' => '&nbsp;'),
-				array('kind' => 'text', 'text' => _('Maximum UID number') . "*: "),
+				array('kind' => 'text', 'text' => _('Maximum UID number') . "* "),
 				array('kind' => 'input', 'name' => 'posixAccount_maxUID', 'type' => 'text', 'size' => '10', 'maxlength' => '255'),
 				array('kind' => 'help', 'value' => 'minMaxUser'))
 		);
 		$return['config_options']['host'] = array(
 		array(
-			array('kind' => 'text', 'text' => '<b>' . _("Hosts") . ': &nbsp;</b>' . _('Minimum UID number') . "*: "),
+			array('kind' => 'text', 'text' => '<b>' . _("Hosts") . ': &nbsp;</b>' . _('Minimum UID number') . "* "),
 			array('kind' => 'input', 'name' => 'posixAccount_minMachine', 'type' => 'text', 'size' => '10', 'maxlength' => '255'),
 			array('kind' => 'text', 'value' => '&nbsp;'),
-			array('kind' => 'text', 'text' => _('Maximum UID number') . "*: "),
+			array('kind' => 'text', 'text' => _('Maximum UID number') . "* "),
 			array('kind' => 'input', 'name' => 'posixAccount_maxMachine', 'type' => 'text', 'size' => '10', 'maxlength' => '255'),
 			array('kind' => 'help', 'value' => 'minMaxHost'))
 		);
 		$return['config_options']['all'] = array(
 			array(
-				array('kind' => 'text', 'text' => '<b>' . _("Password hash type") . ': &nbsp;</b>'),
+				array('kind' => 'text', 'text' => _("Password hash type") . ' &nbsp;'),
 				array('kind' => 'select', 'name' => 'posixAccount_pwdHash', 'size' => '1',
 					'options' => array("CRYPT", "SHA", "SSHA", "MD5", "SMD5", "PLAIN"), 'options_selected' => array('SSHA')),
 				array('kind' => 'text', 'value' => '&nbsp;'),
@@ -185,7 +185,7 @@ class posixAccount extends baseModule implements passwordService {
 				array('kind' => 'text', 'value' => '&nbsp;'),
 				array('kind' => 'help', 'value' => 'pwdHash')),
 			array(
-				array('kind' => 'text', 'text' => '<b>' . _('Set primary group as memberUid') . ":</b> "),
+				array('kind' => 'text', 'text' => _('Set primary group as memberUid')),
 				array('kind' => 'input', 'name' => 'posixAccount_primaryGroupAsSecondary', 'type' => 'checkbox'),
 				array('kind' => 'text', 'value' => '&nbsp;'),
 				array('kind' => 'text', 'value' => '&nbsp;'),
diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc
index 1d795e30..c70eca41 100644
--- a/lam/lib/modules/posixGroup.inc
+++ b/lam/lib/modules/posixGroup.inc
@@ -294,10 +294,10 @@ class posixGroup extends baseModule implements passwordService {
 		// configuration options
 		$return['config_options']['group'] = array(
 			array(
-				array('kind' => 'text', 'text' => '<b>' . _("Groups") . ': &nbsp;</b>' . _('Minimum GID number') . " *: "),
+				array('kind' => 'text', 'text' => '<b>' . _("Groups") . ': &nbsp;</b>' . _('Minimum GID number') . "* "),
 				array('kind' => 'input', 'name' => 'posixGroup_minGID', 'type' => 'text', 'size' => '10', 'maxlength' => '255'),
 				array('kind' => 'text', 'value' => '&nbsp;'),
-				array('kind' => 'text', 'text' => _('Maximum GID number') . " *: "),
+				array('kind' => 'text', 'text' => _('Maximum GID number') . "* "),
 				array('kind' => 'input', 'name' => 'posixGroup_maxGID', 'type' => 'text', 'size' => '10', 'maxlength' => '255'),
 				array('kind' => 'help', 'value' => 'minMaxGID'))
 		);
diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc
index 4713451c..98f92642 100644
--- a/lam/lib/modules/sambaSamAccount.inc
+++ b/lam/lib/modules/sambaSamAccount.inc
@@ -523,7 +523,7 @@ class sambaSamAccount extends baseModule implements passwordService {
 		// configuration options
 		$return['config_options']['user'] = array(
 		array(
-			array('kind' => 'text', 'text' => '<b>' . _("Time zone") . ': &nbsp;</b>'),
+			array('kind' => 'text', 'text' => _("Time zone") . ' &nbsp;'),
 			array('kind' => 'select', 'name' => 'sambaSamAccount_timeZone', 'size' => '1',
 				'options' => array(
 					array('-12', "GMT-12: " . _("Eniwetok, Kwajalein")),
@@ -556,7 +556,7 @@ class sambaSamAccount extends baseModule implements passwordService {
 					'descriptiveOptions' => true),
 			array('kind' => 'help', 'value' => 'timeZone')),
 		array(
-			array('kind' => 'text', 'text' => '<b>' . _("Disable LM hashes") . ': &nbsp;</b>'),
+			array('kind' => 'text', 'text' => _("Disable LM hashes") . ' &nbsp;'),
 			array('kind' => 'select', 'name' => 'sambaSamAccount_lmHash', 'size' => '1',
 				'options' => array(
 					array('yes', _('yes')),
@@ -567,7 +567,7 @@ class sambaSamAccount extends baseModule implements passwordService {
 			array('kind' => 'help', 'value' => 'lmHash')
 		),
 		array(
-			array('kind' => 'text', 'text' => '<b>' . _('Hidden options') . ":</b> ", 'td' => array('valign' => 'top')),
+			array('kind' => 'text', 'text' => _('Hidden options'), 'td' => array('valign' => 'top')),
 			array('kind' => 'table', 'value' => array(
 				array(
 					array('kind' => 'input', 'name' => 'sambaSamAccount_hideHomeDrive', 'type' => 'checkbox'),