diff --git a/lam/templates/domain.php b/lam/templates/domain.php
index 1c15bd56..c9bd630d 100644
--- a/lam/templates/domain.php
+++ b/lam/templates/domain.php
@@ -75,9 +75,9 @@ if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) {
 		echo "<fieldset class=\"domedit\">\n";
 			echo "<legend class=\"domedit\"><b>" . _("Domain Settings") . "</b></legend>\n";
 			echo "<table border=0>\n";
+				// domain name
 				echo "<tr>\n";
 					echo "<td>\n";
-						// domain name
 							echo "<b>" . _("Domain name") . ":</b>\n";
 					echo "</td>\n";
 					echo "<td>\n";
@@ -91,9 +91,64 @@ if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) {
 				echo "<tr>\n";
 					echo "<td>&nbsp;</td><td>&nbsp;</td>\n";
 				echo "</tr>\n";
+				// domain SID
+				echo "<tr>\n";
+					echo "<td>\n";
+					echo "<b>" . _("Domain SID") . ": </b>\n";
+					echo "</td>\n";
+					echo "<td>\n";
+						if ($_GET['action'] == "edit") {
+							echo $domain->SID . "\n";
+						}
+						else echo "<input type=\"text\" size=\"50\" name=\"dom_SID\">\n";
+					echo "</td>\n";
+					echo ("<td><a href=\"help.php?HelpNumber=653\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
+				echo "</tr>\n";
+				echo "<tr>\n";
+					echo "<td>&nbsp;</td><td>&nbsp;</td>\n";
+				echo "</tr>\n";
+				// next RID
+				echo "<tr>\n";
+					echo "<td><b>" . _("Next RID") . ": </b></td>\n";
+					echo "<td>\n";
+						echo "<input type=\"text\" name=\"dom_nextRID\" value=\"" . $domain->nextRID . "\">\n";
+					echo "</td>\n";
+					echo ("<td><a href=\"help.php?HelpNumber=654\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
+				echo "</tr>\n";
+				// next user RID
+				echo "<tr>\n";
+					echo "<td><b>" . _("Next User RID") . ": </b></td>\n";
+					echo "<td>\n";
+						echo "<input type=\"text\" name=\"dom_nextUserRID\" value=\"" . $domain->nextUserRID . "\">\n";
+					echo "</td>\n";
+					echo ("<td><a href=\"help.php?HelpNumber=655\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
+				echo "</tr>\n";
+				// next group RID
+				echo "<tr>\n";
+					echo "<td><b>" . _("Next Group RID") . ": </b></td>\n";
+					echo "<td>\n";
+						echo "<input type=\"text\" name=\"dom_nextGroupRID\" value=\"" . $domain->nextGroupRID . "\">\n";
+					echo "</td>\n";
+					echo ("<td><a href=\"help.php?HelpNumber=656\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
+				echo "</tr>\n";
+				echo "<tr>\n";
+					echo "<td>&nbsp;</td><td>&nbsp;</td>\n";
+				echo "</tr>\n";
+				// algorithmic RID base
+				echo "<tr>\n";
+					echo "<td><b>" . _("Algorithmic RID Base") . ": </b></td>\n";
+					echo "<td>\n";
+						if ($_GET['action'] == "edit") echo $domain->RIDbase . "\n";
+						else echo "<input type=\"text\" name=\"dom_RIDbase\" value=\"" . $domain->RIDbase . "\">\n";
+					echo "</td>\n";
+					echo ("<td><a href=\"help.php?HelpNumber=657\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
+				echo "</tr>\n";
+				echo "<tr>\n";
+					echo "<td>&nbsp;</td><td>&nbsp;</td>\n";
+				echo "</tr>\n";
+				// domain suffix
 				echo "<tr>\n";
 					echo "<td>\n";
-						// domain suffix
 						echo "<b>" . _("Suffix") . ": </b>\n";
 					echo "</td>\n";
 					echo "<td>\n";
@@ -109,58 +164,6 @@ if (($_GET['action'] == "edit") || ($_GET['action'] == "new")) {
 				echo "<tr>\n";
 					echo "<td>&nbsp;</td><td>&nbsp;</td>\n";
 				echo "</tr>\n";
-				echo "<tr>\n";
-					echo "<td>\n";
-					// domain SID
-					echo "<b>" . _("Domain SID") . ": </b>\n";
-					echo "</td>\n";
-					echo "<td>\n";
-						if ($_GET['action'] == "edit") {
-							echo $domain->SID . "\n";
-						}
-						else echo "<input type=\"text\" size=\"50\" name=\"dom_SID\">\n";
-					echo "</td>\n";
-					echo ("<td><a href=\"help.php?HelpNumber=653\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
-				echo "</tr>\n";
-				echo "<tr>\n";
-					echo "<td>&nbsp;</td><td>&nbsp;</td>\n";
-				echo "</tr>\n";
-				echo "<tr>\n";
-					// next RID
-					echo "<td><b>" . _("Next RID") . ": </b></td>\n";
-					echo "<td>\n";
-						echo "<input type=\"text\" name=\"dom_nextRID\" value=\"" . $domain->nextRID . "\">\n";
-					echo "</td>\n";
-					echo ("<td><a href=\"help.php?HelpNumber=654\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
-				echo "</tr>\n";
-				echo "<tr>\n";
-					// next user RID
-					echo "<td><b>" . _("Next User RID") . ": </b></td>\n";
-					echo "<td>\n";
-						echo "<input type=\"text\" name=\"dom_nextUserRID\" value=\"" . $domain->nextUserRID . "\">\n";
-					echo "</td>\n";
-					echo ("<td><a href=\"help.php?HelpNumber=655\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
-				echo "</tr>\n";
-				echo "<tr>\n";
-					// next group RID
-					echo "<td><b>" . _("Next Group RID") . ": </b></td>\n";
-					echo "<td>\n";
-						echo "<input type=\"text\" name=\"dom_nextGroupRID\" value=\"" . $domain->nextGroupRID . "\">\n";
-					echo "</td>\n";
-					echo ("<td><a href=\"help.php?HelpNumber=656\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
-				echo "</tr>\n";
-				echo "<tr>\n";
-					echo "<td>&nbsp;</td><td>&nbsp;</td>\n";
-				echo "</tr>\n";
-				echo "<tr>\n";
-					// algorithmic RID base
-					echo "<td><b>" . _("Algorithmic RID Base") . ": </b></td>\n";
-					echo "<td>\n";
-						if ($_GET['action'] == "edit") echo $domain->RIDbase . "\n";
-						else echo "<input type=\"text\" name=\"dom_RIDbase\" value=\"" . $domain->RIDbase . "\">\n";
-					echo "</td>\n";
-					echo ("<td><a href=\"help.php?HelpNumber=657\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
-				echo "</tr>\n";
 			echo "</table>\n";
 		echo "</fieldset>\n";
 		// post DN and old RID values