Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
diff -u -ra23376f298830f9cb4d3d18e5dc7ef11b907c173 -r800910cc549e3bdfdb72e8134956c5807a79ece9
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision a23376f298830f9cb4d3d18e5dc7ef11b907c173)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 800910cc549e3bdfdb72e8134956c5807a79ece9)
@@ -124,7 +124,7 @@
 	    }
 	}
 	Theme defaultFlashTheme = themeService.getDefaultFlashTheme();
-	for (Theme theme : cssThemes) {
+	for (Theme theme : flashThemes) {
 	    if (theme.getThemeId().equals(defaultFlashTheme.getThemeId())) {
 		userForm.set("userFlashTheme", theme.getThemeId());
 		break;
Index: lams_common/src/java/org/lamsfoundation/lams/themes/service/ThemeService.java
===================================================================
diff -u -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a -r800910cc549e3bdfdb72e8134956c5807a79ece9
--- lams_common/src/java/org/lamsfoundation/lams/themes/service/ThemeService.java	(.../ThemeService.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
+++ lams_common/src/java/org/lamsfoundation/lams/themes/service/ThemeService.java	(.../ThemeService.java)	(revision 800910cc549e3bdfdb72e8134956c5807a79ece9)
@@ -300,8 +300,9 @@
      */
     public Theme getDefaultCSSTheme() {
 	List<Theme> themes = getAllThemes();
+	String defaultTheme = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME);
 	for (Theme theme : themes) {
-	    if (theme.getName().equals(Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME))); {
+	    if (theme.getName().equals(defaultTheme)) {
 		return theme;
 	    }
 	}
@@ -314,8 +315,9 @@
      */
     public Theme getDefaultFlashTheme() {
 	List<Theme> themes = getAllThemes();
+	String defaultTheme = Configuration.get(ConfigurationKeys.DEFAULT_FLASH_THEME);
 	for (Theme theme : themes) {
-	    if (theme.getName().equals(Configuration.get(ConfigurationKeys.DEFAULT_FLASH_THEME))); {
+	    if (theme.getName().equals(defaultTheme)) {
 		return theme;
 	    }
 	}