Index: bp-core-settings.php
===================================================================
--- bp-core-settings.php	(revision 1785)
+++ bp-core-settings.php	(working copy)
@@ -71,8 +71,11 @@
 }
 
 function bp_core_screen_general_settings_content() {
-	global $bp, $current_user, $bp_settings_updated, $pass_error; ?>
+	global $bp, $bp_settings_updated, $pass_error;
 
+	$current_user = set_current_user($bp->displayed_user->id);
+?>
+
 	<?php if ( $bp_settings_updated && !$pass_error ) { ?>
 		<div id="message" class="updated fade">
 			<p><?php _e( 'Changes Saved.', 'buddypress' ) ?></p>
@@ -85,15 +88,20 @@
 		</div>	
 	<?php } ?>
 
-	<form action="<?php echo $bp->loggedin_user->domain . 'settings/general' ?>" method="post" class="standard-form" id="settings-form">
+	<form action="<?php echo $bp->displayed_user->domain . 'settings/general' ?>" method="post" class="standard-form" id="settings-form">
 		<label for="email"><?php _e( 'Account Email', 'buddypress' ) ?></label>
-		<input type="text" name="email" id="email" value="<?php echo attribute_escape( $current_user->user_email ); ?>" class="settings-input" />
-			
+		<p>
+			<input type="text" name="email" id="email" value="<?php echo attribute_escape( $current_user->id ); ?>" class="settings-input" />
+		</p>
+
 		<label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ) ?></label>
-		<input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ) ?>
-		<input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ) ?>
+		
+		<p>
+			<input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ) ?>
+			<input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ) ?>
+		</p>
 	
-		<p class="submit"><input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>
+		<input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/>
 		<?php wp_nonce_field('bp_settings_general') ?>
 	</form>
 <?php
@@ -102,8 +110,10 @@
 /***** NOTIFICATION SETTINGS ******/
 
 function bp_core_screen_notification_settings() {
-	global $current_user, $bp_settings_updated;
-	
+	global $bp, $bp_settings_updated;
+
+	$current_user = set_current_user($bp->displayed_user->id);
+
 	$bp_settings_updated = false;
 	
 	if ( $_POST['submit'] ) {
@@ -111,7 +121,7 @@
 		
 		if ( $_POST['notifications'] ) {
 			foreach ( $_POST['notifications'] as $key => $value ) {
-				update_usermeta( (int)$current_user->id, $key, $value );
+				update_usermeta( (int)$bp->displayed_user->id, $key, $value );
 			}
 		}
 		
@@ -129,7 +139,9 @@
 }
 
 function bp_core_screen_notification_settings_content() {
-	global $bp, $current_user, $bp_settings_updated; ?>
+	global $bp, $bp_settings_updated;
+	$current_user = set_current_user($bp->displayed_user->id);
+?>
 
 	<?php if ( $bp_settings_updated ) { ?>
 		<div id="message" class="updated fade">
@@ -137,7 +149,7 @@
 		</div>
 	<?php } ?>
 	
-	<form action="<?php echo $bp->loggedin_user->domain . 'settings/notifications' ?>" method="post" id="settings-form">
+	<form action="<?php echo $bp->displayed_user->domain . 'settings/notifications' ?>" method="post" id="settings-form">
 		<h3><?php _e( 'Email Notifications', 'buddypress' ) ?></h3>
 		<p><?php _e( 'Send a notification by email when:', 'buddypress' ) ?></p>
 		
@@ -154,7 +166,9 @@
 /**** DELETE ACCOUNT ****/
 
 function bp_core_screen_delete_account() {
-	global $current_user, $bp_settings_updated, $pass_error;
+	global $bp, $bp_settings_updated, $pass_error;
+
+	$current_user = set_current_user($bp->displayed_user->id);
 	
 	if ( isset( $_POST['delete-account-button'] ) ) {
 		check_admin_referer( 'delete-account' );
@@ -205,9 +219,12 @@
 }
 
 function bp_core_screen_delete_account_content() {
-	global $bp, $current_user, $bp_settings_updated, $pass_error; 	?>
+	global $bp, $bp_settings_updated, $pass_error; 	
+	
+	$current_user = set_current_user($bp->displayed_user->id);
+?>
 
-	<form action="<?php echo $bp->loggedin_user->domain . 'settings/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
+	<form action="<?php echo $bp->displayed_user->domain . 'settings/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
 		
 		<div id="message" class="info">
 			<p><?php _e( 'WARNING: Deleting your account will completely remove ALL content associated with it. There is no way back, please be careful with this option.', 'buddypress' ); ?></p>