Index: bp-xprofile/bp-xprofile-screens.php
===================================================================
--- bp-xprofile/bp-xprofile-screens.php
+++ bp-xprofile/bp-xprofile-screens.php
@@ -37,8 +37,11 @@ function xprofile_screen_display_profile() {
  */
 function xprofile_screen_edit_profile() {
 
-	if ( !bp_is_my_profile() && !bp_current_user_can( 'bp_moderate' ) )
+	// Bail if not the correct screen or if the current user cannot edit this
+	// user's settings
+	if ( ! bp_is_my_profile() && ! bp_core_can_edit_settings() ) {
 		return false;
+	}
 
 	$bp = buddypress();
 
@@ -149,9 +152,11 @@ function xprofile_screen_edit_profile() {
  */
 function xprofile_screen_change_avatar() {
 
-	// Bail if not the correct screen
-	if ( !bp_is_my_profile() && !bp_current_user_can( 'bp_moderate' ) )
+	// Bail if not the correct screen or if the current user cannot edit this
+	// user's settings
+	if ( ! bp_is_my_profile() && ! bp_core_can_edit_settings() ) {
 		return false;
+	}
 
 	// Bail if there are action variables
 	if ( bp_action_variables() ) {