diff --git a/lam-0.4/templates/confwiz/o_lang.php b/lam-0.4/templates/confwiz/o_lang.php
index f3f45127..ab3a79fd 100644
--- a/lam-0.4/templates/confwiz/o_lang.php
+++ b/lam-0.4/templates/confwiz/o_lang.php
@@ -149,7 +149,7 @@ echo "<form action=\"o_lang.php\" method=\"post\">\n";
 	echo ("<table border=0>");
 
 	echo ("<tr><td align=\"right\"><b>".
-		_("List of valid users") . " *: </b></td>".
+		_("List of valid users") . ": </b></td>".
 		"<td colspan=2><input size=50 type=\"text\" name=\"admins\" value=\"" . $_SESSION['confwiz_config']->get_Adminstring() . "\"></td>\n");
 	echo ("</tr>\n");
 
diff --git a/lam-0.4/templates/confwiz/o_lists.php b/lam-0.4/templates/confwiz/o_lists.php
index 900c3c4e..3ef1bdcb 100644
--- a/lam-0.4/templates/confwiz/o_lists.php
+++ b/lam-0.4/templates/confwiz/o_lists.php
@@ -123,17 +123,17 @@ echo "<form action=\"o_lists.php\" method=\"post\">\n";
 
 // user list attributes
 echo ("<tr><td align=\"right\"><b>".
-	_("Attributes in User List") . " *:</b></td>".
+	_("Attributes in User List") . ":</b></td>".
 	"<td><input size=50 type=\"text\" name=\"usrlstattr\" value=\"" . $_SESSION['confwiz_config']->get_userlistAttributes() . "\"></td>");
 echo ("</tr>\n");
 // group list attributes
 echo ("<tr><td align=\"right\"><b>".
-	_("Attributes in Group List") . " *:</b></td>".
+	_("Attributes in Group List") . ":</b></td>".
 	"<td><input size=50 type=\"text\" name=\"grplstattr\" value=\"" . $_SESSION['confwiz_config']->get_grouplistAttributes() . "\"></td>");
 echo ("</tr>\n");
 // host list attributes
 echo ("<tr><td align=\"right\"><b>".
-	_("Attributes in Host List") . " *:</b></td>".
+	_("Attributes in Host List") . ":</b></td>".
 	"<td><input size=50 type=\"text\" name=\"hstlstattr\" value=\"" . $_SESSION['confwiz_config']->get_hostlistAttributes() . "\"></td>");
 echo ("</tr>\n");
 
diff --git a/lam-0.4/templates/confwiz/o_ranges.php b/lam-0.4/templates/confwiz/o_ranges.php
index 78f7ec80..ec2d0aff 100644
--- a/lam-0.4/templates/confwiz/o_ranges.php
+++ b/lam-0.4/templates/confwiz/o_ranges.php
@@ -116,28 +116,28 @@ echo "<form action=\"o_ranges.php\" method=\"post\">\n";
 
 	// minUID
 	echo ("<tr><td align=\"right\"><b>".
-		_("Minimum UID number") . " *: </b>".
+		_("Minimum UID number") . ": </b>".
 		"<input size=6 type=\"text\" name=\"minUID\" value=\"" . $_SESSION['confwiz_config']->get_minUID() . "\"></td>\n");
 	// maxUID
-	echo ("<td align=\"right\"><b>&nbsp;" . _("Maximum UID number") . " *: </b>".
+	echo ("<td align=\"right\"><b>&nbsp;" . _("Maximum UID number") . ": </b>".
 		"<input size=6 type=\"text\" name=\"maxUID\" value=\"" . $_SESSION['confwiz_config']->get_maxUID() . "\"></td>\n");
 	// UID text
 	echo ("<td><a href=\"../help.php?HelpNumber=203\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
 	// minGID
 	echo ("<tr><td align=\"right\"><b>".
-		_("Minimum GID number") . " *: </b>".
+		_("Minimum GID number") . ": </b>".
 		"<input size=6 type=\"text\" name=\"minGID\" value=\"" . $_SESSION['confwiz_config']->get_minGID() . "\"></td>\n");
 	// maxGID
-	echo ("<td align=\"right\"><b>&nbsp;" . _("Maximum GID number")." *: </b>".
+	echo ("<td align=\"right\"><b>&nbsp;" . _("Maximum GID number").": </b>".
 		"<input size=6 type=\"text\" name=\"maxGID\" value=\"" . $_SESSION['confwiz_config']->get_maxGID() . "\"></td>\n");
 	// GID text
 	echo ("<td><a href=\"../help.php?HelpNumber=204\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
 	// minMach
 	echo ("<tr><td align=\"right\"><b>".
-		_("Minimum Machine number") . " *: </b>".
+		_("Minimum Machine number") . ": </b>".
 		"<input size=6 type=\"text\" name=\"minMach\" value=\"" . $_SESSION['confwiz_config']->get_minMachine() . "\"></td>\n");
 	// maxMach
-	echo ("<td align=\"right\"><b>&nbsp;" . _("Maximum Machine number") . " *: </b>".
+	echo ("<td align=\"right\"><b>&nbsp;" . _("Maximum Machine number") . ": </b>".
 		"<input size=6 type=\"text\" name=\"maxMach\" value=\"" . $_SESSION['confwiz_config']->get_maxMachine() . "\"></td>\n");
 	// Machine text
 	echo ("<td><a href=\"../help.php?HelpNumber=205\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
diff --git a/lam-0.4/templates/confwiz/server.php b/lam-0.4/templates/confwiz/server.php
index 745a5c9c..bbb0360f 100644
--- a/lam-0.4/templates/confwiz/server.php
+++ b/lam-0.4/templates/confwiz/server.php
@@ -63,6 +63,7 @@ if ($_POST['submit'] || $_POST['cancel']) {
 			$ret = $_SESSION['confwiz_ldap']->connect($_POST['ldapadmin'], $_POST['ldappwd']);
 			if ($ret === 0) {
 				metarefresh('server2.php');
+				exit;
 			}
 			elseif ($ret === False) $error = _("Cannot connect to specified LDAP-Server. Please try again.");
 			elseif ($ret == 81) $error = _("Cannot connect to specified LDAP-Server. Please try again.");
@@ -134,6 +135,7 @@ echo "<form action=\"server.php\" method=\"post\">\n";
 		echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr><td colspan=2>&nbsp;</td></tr>\n";
 	echo "<tr><td colspan=2>&nbsp;</td></tr>\n";
 
 	// admin user+password