Index: lams_admin/web/servermaintain.jsp
===================================================================
diff -u -r9139fadf8c6f7687ffbf50e249474be95c84db07 -rb47e590fe328a0e131c9fa34d1e24633904a42f9
--- lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 9139fadf8c6f7687ffbf50e249474be95c84db07)
+++ lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision b47e590fe328a0e131c9fa34d1e24633904a42f9)
@@ -36,18 +36,16 @@
 		<td><fmt:message key="sysadmin.disabled" />:</td>
 		<td><html:checkbox property="disabled" /></td>
 	</tr>
+	<logic:notEqual name="ServerOrgMapForm" property="orgId" value="-1">
 	<tr>
 		<td><fmt:message key="sysadmin.organisation" />:</td>
 		<td>
 			<html:select property="orgId" >
 				<html:options collection="orgs" property="organisationId" labelProperty="name"/> 
 			</html:select> &nbsp; 
-			<fmt:message key="label.or" /> &nbsp;
-			<html:checkbox property="newOrg" onclick="changeStatus(this)" /> 
-			<fmt:message key="sysadmin.organisation.create" />
-			<html:text property="orgName" disabled="true" size="20"/> *
 		</td>
 	</tr>
+	</logic:notEqual>
 	<tr>
 		<td><fmt:message key="sysadmin.userinfoUrl" />:</td>
 		<td><html:text property="userinfoUrl" size="70"/> *</td>