diff --git src/bp-members/bp-members-template.php src/bp-members/bp-members-template.php
index 4d3824f..a506d5a 100644
--- src/bp-members/bp-members-template.php
+++ src/bp-members/bp-members-template.php
@@ -1684,21 +1684,22 @@ function bp_signup_avatar_dir_value() {
 	 * @return string
 	 */
 	function bp_get_signup_avatar_dir_value() {
-		global $bp;
+		$bp = buddypress();
 
 		// Check if signup_avatar_dir is passed
-		if ( !empty( $_POST['signup_avatar_dir'] ) )
+		if ( ! empty( $_POST['signup_avatar_dir'] ) ) {
 			$signup_avatar_dir = $_POST['signup_avatar_dir'];
 
 		// If not, check if global is set
-		elseif ( !empty( $bp->signup->avatar_dir ) )
+		} else if ( ! empty( $bp->signup->avatar_dir ) ) {
 			$signup_avatar_dir = $bp->signup->avatar_dir;
 
 		// If not, set false
-		else
+		} else {
 			$signup_avatar_dir = false;
+		}
 
-		return apply_filters( 'bp_get_signup_avatar_dir_value', $bp->signup->avatar_dir );
+		return apply_filters( 'bp_get_signup_avatar_dir_value', $signup_avatar_dir );
 	}
 
 /**