Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -r0b4befa34c851fe0ca354488c0d090639dc97cea -rb959a5f41013249a0537fb19bb7129dd727bb55a
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 0b4befa34c851fe0ca354488c0d090639dc97cea)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision b959a5f41013249a0537fb19bb7129dd727bb55a)
@@ -80,9 +80,10 @@
 							<c:if test="${authenticationMethodId eq dbId}">
 
 								<div class="form-group">
-									<span class="lead"><label><fmt:message
-												key="label.username" /></label>: <bean:write name="UserForm"
-											property="login" /></span>
+									<span class="lead">
+										<label><fmt:message key="label.username" /></label>: 
+										<bean:write name="UserForm" property="login" />
+									</span>
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.title" />:</label>
@@ -145,9 +146,18 @@
 										disabled="${!profileEditEnabled}" styleClass="form-control" />
 								</div>
 								<div class="form-group">
-									<label><fmt:message key="label.country" />:</label>
-									<html:text property="country" size="50" maxlength="64"
-										disabled="${!profileEditEnabled}" styleClass="form-control" />
+									<label><fmt:message key="label.country" /> *:</label>
+
+									<html:select property="country" disabled="${!profileEditEnabled}" styleClass="form-control">
+										<html:option value="0">
+											<fmt:message key="label.select.country" />
+										</html:option>
+										<c:forEach items="${countryCodes}" var="countryCode">
+											<html:option value="${countryCode}">
+												<fmt:message key="country.${countryCode}" />
+											</html:option>
+										</c:forEach>
+									</html:select>
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.day_phone" />:</label>