Index: lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java,v
diff -u -r1.7.4.2 -r1.7.4.3
--- lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java	31 Jan 2007 03:30:53 -0000	1.7.4.2
+++ lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java	31 Jan 2007 04:03:48 -0000	1.7.4.3
@@ -55,13 +55,15 @@
 		// define changes.
    		themeList.add(DEFAULT_HTML_THEME); 	   	
 
+   		boolean userThemeFound = false;
 	   	HttpSession ss = SessionManager.getSession();
 	   	if ( ss != null ) {
 	   		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	   		if ( user != null ) {
 	   			theme = user.getHtmlTheme();
 	   			
 	   			if (theme != null ) {
+	   				userThemeFound = true;
 	   				String themeName = theme.getName();
 	   				if ( themeName != null && ! themeName.equals(DEFAULT_HTML_THEME) ) {
 	   					themeList.add(theme.getName());
@@ -71,6 +73,15 @@
 	   		
 	   	}
 	 
+	   	// if we haven't got a user theme, we are probably on the login page
+	   	// so we'd better include the default server theme (if it isn't the LAMS default theme
+	   	if ( !userThemeFound ) {
+	   		String serverDefaultTheme = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME);
+	   		if ( serverDefaultTheme != null && ! serverDefaultTheme.equals(DEFAULT_HTML_THEME) ) {
+	   					themeList.add(theme.getName());
+	   		}
+	   	}
+	   	
 	   	return themeList;
 	}