Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r6ca906104290418a64ec1cf8ac28e14bbe2ed385
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java	(.../UserTag.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java	(.../UserTag.java)	(revision 6ca906104290418a64ec1cf8ac28e14bbe2ed385)
@@ -106,7 +106,8 @@
 
 		    if (property.equals("htmlTheme")) {
 			ThemeDTO theme = (ThemeDTO) value;
-			value = theme.getName();
+			if ( theme != null )
+			    value = theme.getName();
 		    }
 
 		} catch (Exception e) {
Fisheye: Tag 6ca906104290418a64ec1cf8ac28e14bbe2ed385 refers to a dead (removed) revision in file `lams_central/web/css/highContrast.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6ca906104290418a64ec1cf8ac28e14bbe2ed385 refers to a dead (removed) revision in file `lams_central/web/css/highContrast_learner.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6ca906104290418a64ec1cf8ac28e14bbe2ed385 refers to a dead (removed) revision in file `lams_central/web/css/highContrast_rtl.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6ca906104290418a64ec1cf8ac28e14bbe2ed385 refers to a dead (removed) revision in file `lams_central/web/css/highContrast_rtl_learner.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/editprofile.jsp
===================================================================
diff -u -r9dbd97875d2515b0e7b3c884fe36ed8ec8f8e9db -r6ca906104290418a64ec1cf8ac28e14bbe2ed385
--- lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 9dbd97875d2515b0e7b3c884fe36ed8ec8f8e9db)
+++ lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 6ca906104290418a64ec1cf8ac28e14bbe2ed385)
@@ -34,7 +34,10 @@
 				type : $("#newForm").attr('method'),
 				url : $("#newForm").attr('action'),
 				success : function(data) {
-					window.parent.location.reload();
+					if ( data.indexOf('profileRestrictions') > 0)
+						$("html").html(data);
+					else
+						window.parent.location.reload();
 				}
 			});
 		}
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040079.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040079.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040079.sql	(revision 6ca906104290418a64ec1cf8ac28e14bbe2ed385)
@@ -0,0 +1,12 @@
+SET AUTOCOMMIT = 0;
+set FOREIGN_KEY_CHECKS = 0;
+ 
+--  LDEV-4123 Theme management: remove old highcontrast
+UPDATE lams_user SET theme_id = (SELECT theme_id FROM lams_theme WHERE name = 'defaultHTML')
+WHERE theme_id = (SELECT theme_id FROM lams_theme WHERE name = 'highContrast');
+
+DELETE FROM lams_theme WHERE name = 'highContrast';
+
+COMMIT;
+SET AUTOCOMMIT = 1;
+set FOREIGN_KEY_CHECKS = 1;
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -r87602dac688db69886495061488ba4e4268d9f4e -r6ca906104290418a64ec1cf8ac28e14bbe2ed385
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 87602dac688db69886495061488ba4e4268d9f4e)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 6ca906104290418a64ec1cf8ac28e14bbe2ed385)
@@ -504,7 +504,7 @@
 		: pagesWithDisabledTutorials;
 
 	return new UserDTO(userId, firstName, lastName, login, languageIsoCode, countryIsoCode, direction, email,
-		new ThemeDTO(theme),
+		theme != null ? new ThemeDTO(theme) : null,
 		// TimeZone.getTimeZone("Australia/Sydney"),
 		timeZone, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping, lamsCommunityToken,
 		lamsCommunityUsername,