Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5 -r0c4713e27d5f9a122e1f71226dc98f72e7443fb1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 0c4713e27d5f9a122e1f71226dc98f72e7443fb1)
@@ -869,7 +869,7 @@
 	if (count != null) {
 	    return count;
 	} else {
-	    return new Integer(0);
+	    return 0;
 	}
     }
 
@@ -881,8 +881,8 @@
     @Override
     public Theme getDefaultTheme() {
 	String htmlName = Configuration.get(ConfigurationKeys.DEFAULT_THEME);
-	List list = findByProperty(Theme.class, "name", "defaultHTML");
-	return list != null ? (Theme) list.get(0) : null;
+	List<Theme> list = findByProperty(Theme.class, "name", htmlName);
+	return list != null ? list.get(0) : null;
     }
 
     @Override