Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java,v
diff -u -r1.11.4.4 -r1.11.4.5
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java	11 May 2016 07:07:56 -0000	1.11.4.4
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java	8 Dec 2016 04:08:28 -0000	1.11.4.5
@@ -106,7 +106,8 @@
 
 		    if (property.equals("htmlTheme")) {
 			ThemeDTO theme = (ThemeDTO) value;
-			value = theme.getName();
+			if ( theme != null )
+			    value = theme.getName();
 		    }
 
 		} catch (Exception e) {
Index: lams_central/web/editprofile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v
diff -u -r1.23.2.11 -r1.23.2.12
--- lams_central/web/editprofile.jsp	29 Nov 2016 15:47:51 -0000	1.23.2.11
+++ lams_central/web/editprofile.jsp	8 Dec 2016 04:08:28 -0000	1.23.2.12
@@ -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();
 				}
 			});
 		}
Fisheye: Tag 1.5.2.4 refers to a dead (removed) revision in file `lams_central/web/css/highContrast.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.3 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 1.5.2.4 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 1.1.4.3 refers to a dead (removed) revision in file `lams_central/web/css/highContrast_rtl_learner.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040079.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v
diff -u -r1.50.2.11 -r1.50.2.12
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	29 Nov 2016 09:00:11 -0000	1.50.2.11
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	8 Dec 2016 04:07:52 -0000	1.50.2.12
@@ -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,