5 files changed, 5 insertions, 5 deletions
diff --git a/views/default/notifications/settings/usersettings.php b/views/default/notifications/settings/usersettings.php
index 2792ccd4a..f1609d150 100644
--- a/views/default/notifications/settings/usersettings.php
+++ b/views/default/notifications/settings/usersettings.php
@@ -11,7 +11,7 @@
 	 */
 
 	global $NOTIFICATION_HANDLERS;
-	$notification_settings = get_user_notification_settings();
+	$notification_settings = get_user_notification_settings(page_owner());
 ?>
 	<h2><?php echo elgg_echo('notifications:usersettings'); ?></h2>
 	
diff --git a/views/default/user/settings/email.php b/views/default/user/settings/email.php
index 6b14504c7..f8dfaecaa 100644
--- a/views/default/user/settings/email.php
+++ b/views/default/user/settings/email.php
@@ -10,7 +10,7 @@
 	 * @link http://elgg.org/
 	 */
 
-	$user = $_SESSION['user'];
+	$user = page_owner_entity();
 	
 	if ($user) {
 ?>
diff --git a/views/default/user/settings/language.php b/views/default/user/settings/language.php
index 0dbe66b26..43dc91e61 100644
--- a/views/default/user/settings/language.php
+++ b/views/default/user/settings/language.php
@@ -11,7 +11,7 @@
 	 */
 
 	global $CONFIG;
-	$user = $_SESSION['user'];
+	$user = page_owner_entity();
 	
 	if ($user) {
 ?>
diff --git a/views/default/user/settings/name.php b/views/default/user/settings/name.php
index 0faac2428..57b1a1050 100644
--- a/views/default/user/settings/name.php
+++ b/views/default/user/settings/name.php
@@ -10,7 +10,7 @@
 	 * @link http://elgg.org/
 	 */
 
-	$user = $_SESSION['user'];
+	$user = page_owner_entity();
 	
 	if ($user) {
 ?>
diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php
index b180609c6..a45fb621c 100644
--- a/views/default/user/settings/password.php
+++ b/views/default/user/settings/password.php
@@ -10,7 +10,7 @@
 	 * @link http://elgg.org/
 	 */
 
-	$user = $_SESSION['user'];
+	$user = page_owner_entity();
 	
 	if ($user) {
 ?>