Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
diff -u -ra94e0b4531dea809e139dc4a5bce3a7a49f88cc3 -r313fd847623c58375c6ba078242669647d093b2e
--- lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a94e0b4531dea809e139dc4a5bce3a7a49f88cc3)
+++ lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 313fd847623c58375c6ba078242669647d093b2e)
@@ -194,6 +194,7 @@
 
 #=================== Register Server Screen =======================#
 admin.register.sitename=Full Sitename
+admin.register.orgname=Organisation
 admin.register.directory=Directory
 admin.register.directory.public=Public
 admin.register.directory.private=Private
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java
===================================================================
diff -u -r622101803252450b96cc9882a17ae20de4f6e431 -r313fd847623c58375c6ba078242669647d093b2e
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java	(.../RegisterAction.java)	(revision 622101803252450b96cc9882a17ae20de4f6e431)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java	(.../RegisterAction.java)	(revision 313fd847623c58375c6ba078242669647d093b2e)
@@ -56,6 +56,7 @@
  * @struts.action path="/register" parameter="method" name="RegisterForm" input=".register" scope="request" validate="false"
  * @struts.action-forward name="register" path=".register"
  * @struts.action-forward name="sysadmin" path=".sysadmin"
+ * @struts.action-forward name="success" path="http://lamscommunity.org/registration"
  * @struts.action-forward name="error" path=".error"
  */
 public class RegisterAction extends LamsDispatchAction {
@@ -117,18 +118,4 @@
 		return mapping.findForward("register");
 	}
 	
-	public ActionForward register(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws Exception{
-		
-		if (isCancelled(request)) {
-			return mapping.findForward("sysadmin");
-		}
-		
-		DynaActionForm registerForm = (DynaActionForm) form;
-		
-		return mapping.findForward("sysadmin");
-	}
-
 }
Index: lams_admin/web/register.jsp
===================================================================
diff -u -rbaf684f0c64ff2686a9415c68c943ecf4184046d -r313fd847623c58375c6ba078242669647d093b2e
--- lams_admin/web/register.jsp	(.../register.jsp)	(revision baf684f0c64ff2686a9415c68c943ecf4184046d)
+++ lams_admin/web/register.jsp	(.../register.jsp)	(revision 313fd847623c58375c6ba078242669647d093b2e)
@@ -1,8 +1,7 @@
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
 <%@ include file="/taglibs.jsp"%>
 
-<html:form action="/register" method="post">
-	<html:hidden property="method" value="register"/>
+<form action="http://lamscommunity.org/registration" method="post">
 	<h2 align="left">
 		<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> :  
 		<fmt:message key="sysadmin.register.server" />
@@ -18,307 +17,351 @@
 					<fmt:message key="admin.register.sitename"/>
 				</td>
 				<td>
-					<html:text property="sitename" name="sitename" size="40" value=""/>
+					<input type="text" property="sitename" name="sitename" size="40" value=""/>
 				</td>
 			</tr>
 			<tr>
 				<td>
+					<fmt:message key="admin.register.orgname"/>
+				</td>
+				<td>
+					<input type="text" name="organisation" size="40" value=""/>
+				</td>
+			<tr>
+				<td>
 					<fmt:message key="admin.user.name"/>
 				</td>
 				<td>
-					<html:text property="rname" size="40"><bean:write name="RegisterForm" property="rname"/></html:text>
+					<input type="text" name="rname" size="40" value="<bean:write name="RegisterForm" property="rname"/>"/>
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="admin.user.email"/>
 				</td>
 				<td>
-					<html:text property="remail" size="40"><bean:write name="RegisterForm" property="remail"/></html:text>
+					<input type="text" name="remail" size="40" value="<bean:write name="RegisterForm" property="remail"/>"/>
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="admin.user.country"/>
 				</td>
 				<td>
-					<html:select property="servercountry">
-						 <html:option value="AF">Afghanistan</html:option>
-						 <html:option value="AX">Aland Islands</html:option>
-						 <html:option value="AL">Albania</html:option>
+					<select name="servercountry"><option value="AF">Afghanistan</option>
+						 <option value="AX">Aland Islands</option>
+
+						 <option value="AL">Albania</option>
 						
-						 <html:option value="DZ">Algeria</html:option>
-						 <html:option value="AS">American Samoa</html:option>
-						 <html:option value="AD">Andorra</html:option>
-						 <html:option value="AO">Angola</html:option>
-						 <html:option value="AI">Anguilla</html:option>
-						 <html:option value="AQ">Antarctica</html:option>
+						 <option value="DZ">Algeria</option>
+						 <option value="AS">American Samoa</option>
+						 <option value="AD">Andorra</option>
+						 <option value="AO">Angola</option>
+						 <option value="AI">Anguilla</option>
+
+						 <option value="AQ">Antarctica</option>
 						
-						 <html:option value="AG">Antigua And Barbuda</html:option>
-						 <html:option value="AR">Argentina</html:option>
-						 <html:option value="AM">Armenia</html:option>
-						 <html:option value="AW">Aruba</html:option>
-						 <html:option value="AU">Australia</html:option>
-						 <html:option value="AT">Austria</html:option>
+						 <option value="AG">Antigua And Barbuda</option>
+						 <option value="AR">Argentina</option>
+						 <option value="AM">Armenia</option>
+						 <option value="AW">Aruba</option>
+						 <option value="AU">Australia</option>
+
+						 <option value="AT">Austria</option>
 						
-						 <html:option value="AZ">Azerbaijan</html:option>
-						 <html:option value="BS">Bahamas</html:option>
-						 <html:option value="BH">Bahrain</html:option>
-						 <html:option value="BD">Bangladesh</html:option>
-						 <html:option value="BB">Barbados</html:option>
-						 <html:option value="BY">Belarus</html:option>
+						 <option value="AZ">Azerbaijan</option>
+						 <option value="BS">Bahamas</option>
+						 <option value="BH">Bahrain</option>
+						 <option value="BD">Bangladesh</option>
+						 <option value="BB">Barbados</option>
+
+						 <option value="BY">Belarus</option>
 						
-						 <html:option value="BE">Belgium</html:option>
-						 <html:option value="BZ">Belize</html:option>
-						 <html:option value="BJ">Benin</html:option>
-						 <html:option value="BM">Bermuda</html:option>
-						 <html:option value="BT">Bhutan</html:option>
-						 <html:option value="BO">Bolivia</html:option>
+						 <option value="BE">Belgium</option>
+						 <option value="BZ">Belize</option>
+						 <option value="BJ">Benin</option>
+						 <option value="BM">Bermuda</option>
+						 <option value="BT">Bhutan</option>
+
+						 <option value="BO">Bolivia</option>
 						
-						 <html:option value="BA">Bosnia And Herzegovina</html:option>
-						 <html:option value="BW">Botswana</html:option>
-						 <html:option value="BV">Bouvet Island</html:option>
-						 <html:option value="BR">Brazil</html:option>
-						 <html:option value="BN">Brunei Darussalam</html:option>
-						 <html:option value="BG">Bulgaria</html:option>
+						 <option value="BA">Bosnia And Herzegovina</option>
+						 <option value="BW">Botswana</option>
+						 <option value="BV">Bouvet Island</option>
+						 <option value="BR">Brazil</option>
+						 <option value="BN">Brunei Darussalam</option>
+
+						 <option value="BG">Bulgaria</option>
 						
-						 <html:option value="BF">Burkina Faso</html:option>
-						 <html:option value="BI">Burundi</html:option>
-						 <html:option value="KH">Cambodia</html:option>
-						 <html:option value="CM">Cameroon</html:option>
-						 <html:option value="CA">Canada</html:option>
-						 <html:option value="CV">Cape Verde</html:option>
+						 <option value="BF">Burkina Faso</option>
+						 <option value="BI">Burundi</option>
+						 <option value="KH">Cambodia</option>
+						 <option value="CM">Cameroon</option>
+						 <option value="CA">Canada</option>
+
+						 <option value="CV">Cape Verde</option>
 						
-						 <html:option value="KY">Cayman Islands</html:option>
-						 <html:option value="CF">Central African Republic</html:option>
-						 <html:option value="TD">Chad</html:option>
-						 <html:option value="CL">Chile</html:option>
-						 <html:option value="CN">China</html:option>
-						 <html:option value="CX">Christmas Island</html:option>
+						 <option value="KY">Cayman Islands</option>
+						 <option value="CF">Central African Republic</option>
+						 <option value="TD">Chad</option>
+						 <option value="CL">Chile</option>
+						 <option value="CN">China</option>
+
+						 <option value="CX">Christmas Island</option>
 						
-						 <html:option value="CC">Cocos (Keeling) Islands</html:option>
-						 <html:option value="CO">Colombia</html:option>
-						 <html:option value="KM">Comoros</html:option>
-						 <html:option value="CG">Congo</html:option>
-						 <html:option value="CK">Cook Islands</html:option>
-						 <html:option value="CR">Costa Rica</html:option>
+						 <option value="CC">Cocos (Keeling) Islands</option>
+						 <option value="CO">Colombia</option>
+						 <option value="KM">Comoros</option>
+						 <option value="CG">Congo</option>
+						 <option value="CK">Cook Islands</option>
+
+						 <option value="CR">Costa Rica</option>
 						
-						 <html:option value="CI">Cote DIvoire</html:option>
-						 <html:option value="HR">Croatia</html:option>
-						 <html:option value="CU">Cuba</html:option>
-						 <html:option value="CY">Cyprus</html:option>
-						 <html:option value="CZ">Czech Republic</html:option>
-						 <html:option value="DK">Denmark</html:option>
+						 <option value="CI">Cote DIvoire</option>
+						 <option value="HR">Croatia</option>
+						 <option value="CU">Cuba</option>
+						 <option value="CY">Cyprus</option>
+						 <option value="CZ">Czech Republic</option>
+
+						 <option value="DK">Denmark</option>
 						
-						 <html:option value="DJ">Djibouti</html:option>
-						 <html:option value="DM">Dominica</html:option>
-						 <html:option value="DO">Dominican Republic</html:option>
-						 <html:option value="EC">Ecuador</html:option>
-						 <html:option value="EG">Egypt</html:option>
-						 <html:option value="SV">El Salvador</html:option>
+						 <option value="DJ">Djibouti</option>
+						 <option value="DM">Dominica</option>
+						 <option value="DO">Dominican Republic</option>
+						 <option value="EC">Ecuador</option>
+						 <option value="EG">Egypt</option>
+
+						 <option value="SV">El Salvador</option>
 						
-						 <html:option value="GQ">Equatorial Guinea</html:option>
-						 <html:option value="ER">Eritrea</html:option>
-						 <html:option value="EE">Estonia</html:option>
-						 <html:option value="ET">Ethiopia</html:option>
-						 <html:option value="FO">Faroe Islands</html:option>
-						 <html:option value="FJ">Fiji</html:option>
+						 <option value="GQ">Equatorial Guinea</option>
+						 <option value="ER">Eritrea</option>
+						 <option value="EE">Estonia</option>
+						 <option value="ET">Ethiopia</option>
+						 <option value="FO">Faroe Islands</option>
+
+						 <option value="FJ">Fiji</option>
 						
-						 <html:option value="FI">Finland</html:option>
-						 <html:option value="FR">France</html:option>
-						 <html:option value="GF">French Guiana</html:option>
-						 <html:option value="PF">French Polynesia</html:option>
-						 <html:option value="TF">French Southern Territories</html:option>
-						 <html:option value="GA">Gabon</html:option>
+						 <option value="FI">Finland</option>
+						 <option value="FR">France</option>
+						 <option value="GF">French Guiana</option>
+						 <option value="PF">French Polynesia</option>
+						 <option value="TF">French Southern Territories</option>
+
+						 <option value="GA">Gabon</option>
 						
-						 <html:option value="GM">Gambia</html:option>
-						 <html:option value="GE">Georgia</html:option>
-						 <html:option value="DE">Germany</html:option>
-						 <html:option value="GH">Ghana</html:option>
-						 <html:option value="GI">Gibraltar</html:option>
-						 <html:option value="GR">Greece</html:option>
+						 <option value="GM">Gambia</option>
+						 <option value="GE">Georgia</option>
+						 <option value="DE">Germany</option>
+						 <option value="GH">Ghana</option>
+						 <option value="GI">Gibraltar</option>
+
+						 <option value="GR">Greece</option>
 						
-						 <html:option value="GL">Greenland</html:option>
-						 <html:option value="GD">Grenada</html:option>
-						 <html:option value="GP">Guadeloupe</html:option>
-						 <html:option value="GU">Guam</html:option>
-						 <html:option value="GT">Guatemala</html:option>
-						 <html:option value="GN">Guinea</html:option>
+						 <option value="GL">Greenland</option>
+						 <option value="GD">Grenada</option>
+						 <option value="GP">Guadeloupe</option>
+						 <option value="GU">Guam</option>
+						 <option value="GT">Guatemala</option>
+
+						 <option value="GN">Guinea</option>
 						
-						 <html:option value="GW">Guinea-Bissau</html:option>
-						 <html:option value="GY">Guyana</html:option>
-						 <html:option value="HT">Haiti</html:option>
-						 <html:option value="VA">Holy See (Vatican City State)</html:option>
-						 <html:option value="HN">Honduras</html:option>
-						 <html:option value="HK">Hong Kong</html:option>
+						 <option value="GW">Guinea-Bissau</option>
+						 <option value="GY">Guyana</option>
+						 <option value="HT">Haiti</option>
+						 <option value="VA">Holy See (Vatican City State)</option>
+						 <option value="HN">Honduras</option>
+
+						 <option value="HK">Hong Kong</option>
 						
-						 <html:option value="HU">Hungary</html:option>
-						 <html:option value="IS">Iceland</html:option>
-						 <html:option value="IN">India</html:option>
-						 <html:option value="ID">Indonesia</html:option>
-						 <html:option value="IR">Iran</html:option>
-						 <html:option value="IQ">Iraq</html:option>
+						 <option value="HU">Hungary</option>
+						 <option value="IS">Iceland</option>
+						 <option value="IN">India</option>
+						 <option value="ID">Indonesia</option>
+						 <option value="IR">Iran</option>
+
+						 <option value="IQ">Iraq</option>
 						
-						 <html:option value="IE">Ireland</html:option>
-						 <html:option value="IL">Israel</html:option>
-						 <html:option value="IT">Italy</html:option>
-						 <html:option value="JM">Jamaica</html:option>
-						 <html:option value="JP">Japan</html:option>
-						 <html:option value="JO">Jordan</html:option>
+						 <option value="IE">Ireland</option>
+						 <option value="IL">Israel</option>
+						 <option value="IT">Italy</option>
+						 <option value="JM">Jamaica</option>
+						 <option value="JP">Japan</option>
+
+						 <option value="JO">Jordan</option>
 						
-						 <html:option value="KZ">Kazakhstan</html:option>
-						 <html:option value="KE">Kenya</html:option>
-						 <html:option value="KI">Kiribati</html:option>
-						 <html:option value="KP">North Korea</html:option>
-						 <html:option value="KR">South Korea</html:option>
-						 <html:option value="KW">Kuwait</html:option>
+						 <option value="KZ">Kazakhstan</option>
+						 <option value="KE">Kenya</option>
+						 <option value="KI">Kiribati</option>
+						 <option value="KP">North Korea</option>
+						 <option value="KR">South Korea</option>
+
+						 <option value="KW">Kuwait</option>
 						
-						 <html:option value="KG">Kyrgyzstan</html:option>
-						 <html:option value="LA">Lao Peoples Democratic Republic</html:option>
-						 <html:option value="LV">Latvia</html:option>
-						 <html:option value="LB">Lebanon</html:option>
-						 <html:option value="LS">Lesotho</html:option>
-						 <html:option value="LR">Liberia</html:option>
+						 <option value="KG">Kyrgyzstan</option>
+						 <option value="LA">Lao Peoples Democratic Republic</option>
+						 <option value="LV">Latvia</option>
+						 <option value="LB">Lebanon</option>
+						 <option value="LS">Lesotho</option>
+
+						 <option value="LR">Liberia</option>
 						
-						 <html:option value="LY">Libyan Arab Jamahiriya</html:option>
-						 <html:option value="LI">Liechtenstein</html:option>
-						 <html:option value="LT">Lithuania</html:option>
-						 <html:option value="LU">Luxembourg</html:option>
-						 <html:option value="MO">Macao</html:option>
-						 <html:option value="MK">Macedonia, FYRO</html:option>
+						 <option value="LY">Libyan Arab Jamahiriya</option>
+						 <option value="LI">Liechtenstein</option>
+						 <option value="LT">Lithuania</option>
+						 <option value="LU">Luxembourg</option>
+						 <option value="MO">Macao</option>
+
+						 <option value="MK">Macedonia, FYRO</option>
 						
-						 <html:option value="MG">Madagascar</html:option>
-						 <html:option value="MW">Malawi</html:option>
-						 <html:option value="MY">Malaysia</html:option>
-						 <html:option value="MV">Maldives</html:option>
-						 <html:option value="ML">Mali</html:option>
-						 <html:option value="MT">Malta</html:option>
+						 <option value="MG">Madagascar</option>
+						 <option value="MW">Malawi</option>
+						 <option value="MY">Malaysia</option>
+						 <option value="MV">Maldives</option>
+						 <option value="ML">Mali</option>
+
+						 <option value="MT">Malta</option>
 						
-						 <html:option value="MH">Marshall Islands</html:option>
-						 <html:option value="MQ">Martinique</html:option>
-						 <html:option value="MR">Mauritania</html:option>
-						 <html:option value="MU">Mauritius</html:option>
-						 <html:option value="YT">Mayotte</html:option>
-						 <html:option value="MX">Mexico</html:option>
+						 <option value="MH">Marshall Islands</option>
+						 <option value="MQ">Martinique</option>
+						 <option value="MR">Mauritania</option>
+						 <option value="MU">Mauritius</option>
+						 <option value="YT">Mayotte</option>
+
+						 <option value="MX">Mexico</option>
 						
-						 <html:option value="FM">Micronesia</html:option>
-						 <html:option value="MD">Moldova</html:option>
-						 <html:option value="MC">Monaco</html:option>
-						 <html:option value="MN">Mongolia</html:option>
-						 <html:option value="MS">Montserrat</html:option>
-						 <html:option value="MA">Morocco</html:option>
+						 <option value="FM">Micronesia</option>
+						 <option value="MD">Moldova</option>
+						 <option value="MC">Monaco</option>
+						 <option value="MN">Mongolia</option>
+						 <option value="MS">Montserrat</option>
+
+						 <option value="MA">Morocco</option>
 						
-						 <html:option value="MZ">Mozambique</html:option>
-						 <html:option value="MM">Myanmar</html:option>
-						 <html:option value="NA">Namibia</html:option>
-						 <html:option value="NR">Nauru</html:option>
-						 <html:option value="NP">Nepal</html:option>
-						 <html:option value="NL">Netherlands</html:option>
+						 <option value="MZ">Mozambique</option>
+						 <option value="MM">Myanmar</option>
+						 <option value="NA">Namibia</option>
+						 <option value="NR">Nauru</option>
+						 <option value="NP">Nepal</option>
+
+						 <option value="NL">Netherlands</option>
 						
-						 <html:option value="AN">Netherlands Antilles</html:option>
-						 <html:option value="NC">New Caledonia</html:option>
-						 <html:option value="NZ">New Zealand</html:option>
-						 <html:option value="NI">Nicaragua</html:option>
-						 <html:option value="NE">Niger</html:option>
-						 <html:option value="NG">Nigeria</html:option>
+						 <option value="AN">Netherlands Antilles</option>
+						 <option value="NC">New Caledonia</option>
+						 <option value="NZ">New Zealand</option>
+						 <option value="NI">Nicaragua</option>
+						 <option value="NE">Niger</option>
+
+						 <option value="NG">Nigeria</option>
 						
-						 <html:option value="NU">Niue</html:option>
-						 <html:option value="NF">Norfolk Island</html:option>
-						 <html:option value="NO">Norway</html:option>
-						 <html:option value="OM">Oman</html:option>
-						 <html:option value="PK">Pakistan</html:option>
-						 <html:option value="PW">Palau</html:option>
+						 <option value="NU">Niue</option>
+						 <option value="NF">Norfolk Island</option>
+						 <option value="NO">Norway</option>
+						 <option value="OM">Oman</option>
+						 <option value="PK">Pakistan</option>
+
+						 <option value="PW">Palau</option>
 						
-						 <html:option value="PS">Palestinian Territory</html:option>
-						 <html:option value="PA">Panama</html:option>
-						 <html:option value="PG">Papua New Guinea</html:option>
-						 <html:option value="PY">Paraguay</html:option>
-						 <html:option value="PE">Peru</html:option>
-						 <html:option value="PH">Philippines</html:option>
+						 <option value="PS">Palestinian Territory</option>
+						 <option value="PA">Panama</option>
+						 <option value="PG">Papua New Guinea</option>
+						 <option value="PY">Paraguay</option>
+						 <option value="PE">Peru</option>
+
+						 <option value="PH">Philippines</option>
 						
-						 <html:option value="PN">Pitcairn</html:option>
-						 <html:option value="PL">Poland</html:option>
-						 <html:option value="PT">Portugal</html:option>
-						 <html:option value="PR">Puerto Rico</html:option>
-						 <html:option value="QA">Qatar</html:option>
-						 <html:option value="RE">Reunion</html:option>
+						 <option value="PN">Pitcairn</option>
+						 <option value="PL">Poland</option>
+						 <option value="PT">Portugal</option>
+						 <option value="PR">Puerto Rico</option>
+						 <option value="QA">Qatar</option>
+
+						 <option value="RE">Reunion</option>
 						
-						 <html:option value="RO">Romania</html:option>
-						 <html:option value="RU">Russia</html:option>
-						 <html:option value="RW">Rwanda</html:option>
-						 <html:option value="SH">Saint Helena</html:option>
-						 <html:option value="KN">Saint Kitts And Nevis</html:option>
-						 <html:option value="LC">Saint Lucia</html:option>
+						 <option value="RO">Romania</option>
+						 <option value="RU">Russia</option>
+						 <option value="RW">Rwanda</option>
+						 <option value="SH">Saint Helena</option>
+						 <option value="KN">Saint Kitts And Nevis</option>
+
+						 <option value="LC">Saint Lucia</option>
 						
-						 <html:option value="PM">Saint Pierre And Miquelon</html:option>
-						 <html:option value="VC">Saint Vincent And The Grenadines</html:option>
-						 <html:option value="WS">Samoa</html:option>
-						 <html:option value="SM">San Marino</html:option>
-						 <html:option value="ST">Sao Tome And Principe</html:option>
-						 <html:option value="SA">Saudi Arabia</html:option>
+						 <option value="PM">Saint Pierre And Miquelon</option>
+						 <option value="VC">Saint Vincent And The Grenadines</option>
+						 <option value="WS">Samoa</option>
+						 <option value="SM">San Marino</option>
+						 <option value="ST">Sao Tome And Principe</option>
+
+						 <option value="SA">Saudi Arabia</option>
 						
-						 <html:option value="SN">Senegal</html:option>
-						 <html:option value="CS">Serbia And Montenegro</html:option>
-						 <html:option value="SC">Seychelles</html:option>
-						 <html:option value="SL">Sierra Leone</html:option>
-						 <html:option value="SG">Singapore</html:option>
-						 <html:option value="SK">Slovakia</html:option>
+						 <option value="SN">Senegal</option>
+						 <option value="CS">Serbia And Montenegro</option>
+						 <option value="SC">Seychelles</option>
+						 <option value="SL">Sierra Leone</option>
+						 <option value="SG">Singapore</option>
+
+						 <option value="SK">Slovakia</option>
 						
-						 <html:option value="SI">Slovenia</html:option>
-						 <html:option value="SB">Solomon Islands</html:option>
-						 <html:option value="SO">Somalia</html:option>
-						 <html:option value="ZA">South Africa</html:option>
-						 <html:option value="ES">Spain</html:option>
-						 <html:option value="LK">Sri Lanka</html:option>
+						 <option value="SI">Slovenia</option>
+						 <option value="SB">Solomon Islands</option>
+						 <option value="SO">Somalia</option>
+						 <option value="ZA">South Africa</option>
+						 <option value="ES">Spain</option>
+
+						 <option value="LK">Sri Lanka</option>
 						
-						 <html:option value="SD">Sudan</html:option>
-						 <html:option value="SR">Suriname</html:option>
-						 <html:option value="SZ">Swaziland</html:option>
-						 <html:option value="SE">Sweden</html:option>
-						 <html:option value="CH">Switzerland</html:option>
-						 <html:option value="SY">Syria</html:option>
+						 <option value="SD">Sudan</option>
+						 <option value="SR">Suriname</option>
+						 <option value="SZ">Swaziland</option>
+						 <option value="SE">Sweden</option>
+						 <option value="CH">Switzerland</option>
+
+						 <option value="SY">Syria</option>
 						
-						 <html:option value="TW">Taiwan</html:option>
-						 <html:option value="TJ">Tajikistan</html:option>
-						 <html:option value="TZ">Tanzania</html:option>
-						 <html:option value="TH">Thailand</html:option>
-						 <html:option value="TL">Timor-Leste</html:option>
-						 <html:option value="TG">Togo</html:option>
+						 <option value="TW">Taiwan</option>
+						 <option value="TJ">Tajikistan</option>
+						 <option value="TZ">Tanzania</option>
+						 <option value="TH">Thailand</option>
+						 <option value="TL">Timor-Leste</option>
+
+						 <option value="TG">Togo</option>
 						
-						 <html:option value="TK">Tokelau</html:option>
-						 <html:option value="TO">Tonga</html:option>
-						 <html:option value="TT">Trinidad And Tobago</html:option>
-						 <html:option value="TN">Tunisia</html:option>
-						 <html:option value="TR">Turkey</html:option>
-						 <html:option value="TM">Turkmenistan</html:option>
+						 <option value="TK">Tokelau</option>
+						 <option value="TO">Tonga</option>
+						 <option value="TT">Trinidad And Tobago</option>
+						 <option value="TN">Tunisia</option>
+						 <option value="TR">Turkey</option>
+
+						 <option value="TM">Turkmenistan</option>
 						
-						 <html:option value="TV">Tuvalu</html:option>
-						 <html:option value="UG">Uganda</html:option>
-						 <html:option value="UA">Ukraine</html:option>
-						 <html:option value="AE">United Arab Emirates</html:option>
-						 <html:option value="GB">United Kingdom</html:option>
-						 <html:option value="US">United States</html:option>
+						 <option value="TV">Tuvalu</option>
+						 <option value="UG">Uganda</option>
+						 <option value="UA">Ukraine</option>
+						 <option value="AE">United Arab Emirates</option>
+						 <option value="GB">United Kingdom</option>
+
+						 <option value="US">United States</option>
 						
-						 <html:option value="UY">Uruguay</html:option>
-						 <html:option value="UZ">Uzbekistan</html:option>
-						 <html:option value="VU">Vanuatu</html:option>
-						 <html:option value="VE">Venezuela</html:option>
-						 <html:option value="VN">Viet Nam</html:option>
-						 <html:option value="EH">Western Sahara</html:option>
+						 <option value="UY">Uruguay</option>
+						 <option value="UZ">Uzbekistan</option>
+						 <option value="VU">Vanuatu</option>
+						 <option value="VE">Venezuela</option>
+						 <option value="VN">Viet Nam</option>
+
+						 <option value="EH">Western Sahara</option>
 						
-						 <html:option value="YE">Yemen</html:option>
-						 <html:option value="ZM">Zambia</html:option>
-						 <html:option value="ZW">Zimbabwe</html:option>
-					</html:select>
+						 <option value="YE">Yemen</option>
+						 <option value="ZM">Zambia</option>
+						 <option value="ZW">Zimbabwe</option>
+					</select>
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="admin.register.directory"/>
 				</td>
 				<td>
-					<html:radio property="public" value="true">&nbsp;<fmt:message key="admin.register.directory.public"/></html:radio>&nbsp;&nbsp;
-					<html:radio property="public" value="false">&nbsp;<fmt:message key="admin.register.directory.private"/></html:radio>
+					<input type="radio" name="public" value="true" checked="checked">&nbsp;<fmt:message key="admin.register.directory.public"/>&nbsp;&nbsp;
+					<input type="radio" name="public" value="false">&nbsp;<fmt:message key="admin.register.directory.private"/>
 				</td>
 			</tr>
 			<tr>
@@ -332,7 +375,7 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="serverurl"/>
-					<html:hidden property="serverurl"/>
+					<input type="hidden" name="serverurl" value="<bean:write name="RegisterForm" property="serverurl"/>"/>
 				</td>
 			</tr>
 			<tr>
@@ -341,7 +384,7 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="serverversion"/>
-					<html:hidden property="serverversion"/>
+					<input type="hidden" name="serverversion" value="<bean:write name="RegisterForm" property="serverversion"/>"/>
 				</td>
 			</tr>
 			<tr>
@@ -350,7 +393,7 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="serverbuild"/>
-					<html:hidden property="serverbuild"/>
+					<input type="hidden" name="serverbuild" value="<bean:write name="RegisterForm" property="serverbuild"/>"/>
 				</td>
 			</tr>
 			<tr>
@@ -359,7 +402,7 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="serverlocale"/>
-					<html:hidden property="serverlocale"/>
+					<input type="hidden" name="serverlocale" value="<bean:write name="RegisterForm" property="serverlocale"/>"/>
 				</td>
 			</tr>
 			<tr>
@@ -368,7 +411,7 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="langdate"/>
-					<html:hidden property="langdate"/>
+					<input type="hidden" name="langdate" value="<bean:write name="RegisterForm" property="langdate"/>"/>
 				</td>
 			</tr>
 			<tr>
@@ -382,7 +425,7 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="groupno"/>
-					<html:hidden property="groupno"/>
+					<input type="hidden" name="groupno" value="<bean:write name="RegisterForm" property="groupno"/>"/>
 				</td>
 			</tr>
 			<tr>
@@ -391,7 +434,7 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="subgroupno"/>
-					<html:hidden property="subgroupno"/>
+					<input type="hidden" name="subgroupno" value="<bean:write name="RegisterForm" property="subgroupno"/>"/>
 				</td>
 			<tr>
 			<tr>
@@ -400,7 +443,7 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="sysadminno"/>
-					<html:hidden property="sysadminno"/>
+					<input type="hidden" name="sysadminno" value="<bean:write name="RegisterForm" property="sysadminno"/>"/>
 				</td>
 			</tr>
 			<tr>
@@ -409,7 +452,7 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="adminno"/>
-					<html:hidden property="adminno"/>
+					<input type="hidden" name="adminno" value="<bean:write name="RegisterForm" property="adminno"/>"/>
 				</td>
 			</tr>
 			<tr>
@@ -418,7 +461,7 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="managerno"/>
-					<html:hidden property="managerno"/>
+					<input type="hidden" name="managerno" value="<bean:write name="RegisterForm" property="managerno"/>"/>
 				</td>
 			</tr>
 			<tr>
@@ -427,7 +470,7 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="authorno"/>
-					<html:hidden property="authorno"/>
+					<input type="hidden" property="authorno" value="<bean:write name="RegisterForm" property="authorno"/>"/>
 				</td>
 			</tr>
 			<tr>
@@ -436,7 +479,7 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="monitorno"/>
-					<html:hidden property="monitorno"/>
+					<input type="hidden" name="monitorno" value="<bean:write name="RegisterForm" property="monitorno"/>"/>
 				</td>
 			</tr>
 			<tr>
@@ -445,14 +488,15 @@
 				</td>
 				<td>
 					<bean:write name="RegisterForm" property="learnerno"/>
-					<html:hidden property="learnerno"/>	
+					<input type="hidden" name="learnerno" value="<bean:write name="RegisterForm" property="learnerno"/>"/>	
 				</td>
 			</tr>
 	</table>
 	
 	<p align="center">
-		<html:submit><fmt:message key="admin.register" /></html:submit>
-		<html:reset><fmt:message key="admin.reset" /></html:reset>
-		<html:cancel><fmt:message key="admin.cancel" /></html:cancel>
+		<input type="submit" value="<fmt:message key="admin.register" />"/>
+		<input type="reset"  value="<fmt:message key="admin.reset" />"/>
+		<input type="button" value="<fmt:message key="admin.cancel" />" onClick="javascript:history.back(-1)"/>
 	</p>
-</html:form>
\ No newline at end of file
+</form>
+