Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java,v
diff -u -r1.14 -r1.15
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	8 Jan 2008 07:02:32 -0000	1.14
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	31 Oct 2008 00:54:04 -0000	1.15
@@ -47,6 +47,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.IndexUtils;
+import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -196,10 +197,12 @@
             HttpServletResponse response) throws Exception {
 		
 		User requestor = (User)getService().getUserByLogin(request.getRemoteUser());
-		log.debug("editing profile of userId: "+requestor.getUserId());
 		DynaActionForm userForm = (DynaActionForm)form;
 		BeanUtils.copyProperties(userForm, requestor);
 		SupportedLocale locale = requestor.getLocale();
+		if (locale == null) {
+		    locale = LanguageUtil.getDefaultLocale();
+		}
 		userForm.set("localeId",locale.getLocaleId());
 		request.setAttribute("locales", locales);
 		request.setAttribute("tab", "profile");