Index: bp-xprofile-admin.php
===================================================================
--- bp-xprofile-admin.php	(revision 11580)
+++ bp-xprofile-admin.php	(working copy)
@@ -130,13 +130,18 @@
 	// Get all of the profile groups & fields.
 	$groups = bp_xprofile_get_groups( array(
 		'fetch_fields' => true
-	) ); ?>
+	) );
 
+	$users_url = bp_get_admin_url( 'users.php' ); ?>
+
 	<div class="wrap">
 
 		<h1>
-			<?php _ex( 'Profile Fields', 'Settings page header', 'buddypress'); ?>
-			<a id="add_group" class="add-new-h2" href="users.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Field Group', 'buddypress' ); ?></a>
+			<?php
+			_ex( 'Profile Fields', 'Settings page header', 'buddypress' );
+			$add_group_url = add_query_arg( array( 'page' => 'bp-profile-setup', 'mode' => 'add_group' ), $users_url );
+			?>
+			<a id="add_group" class="add-new-h2" href="<?php echo esc_url( $add_group_url ); ?>"><?php _e( 'Add New Field Group', 'buddypress' ); ?></a>
 		</h1>
 
 		<form action="" id="profile-field-form" method="post">
@@ -190,13 +195,30 @@
 					<div id="tabs-<?php echo esc_attr( $group->id ); ?>" class="tab-wrapper">
 						<div class="tab-toolbar">
 							<div class="tab-toolbar-left">
-								<a class="button-primary" href="users.php?page=bp-profile-setup&amp;group_id=<?php echo esc_attr( $group->id ); ?>&amp;mode=add_field"><?php _e( 'Add New Field', 'buddypress' ); ?></a>
-								<a class="button edit" href="users.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=<?php echo esc_attr( $group->id ); ?>"><?php _ex( 'Edit Group', 'Edit Profile Fields Group', 'buddypress' ); ?></a>
+								<?php
+								$add_new_url = add_query_arg( array(
+									'page'     => 'bp-profile-setup',
+									'mode'     => 'add_field',
+									'group_id' => urlencode( $group->id )
+								), $users_url );
+								$edit_url    = add_query_arg( array(
+									'page'     => 'bp-profile-setup',
+									'mode'     => 'edit_group',
+									'group_id' => urlencode( $group->id )
+								), $users_url );
+								$delete_url  = add_query_arg( array(
+									'page'     => 'bp-profile-setup',
+									'mode'     => 'delete_group',
+									'group_id' => urlencode( $group->id ),
+								), $users_url );
+								?>
+								<a class="button-primary" href="<?php echo esc_url( $add_new_url ); ?>"><?php _e( 'Add New Field', 'buddypress' ); ?></a>
+								<a class="button edit" href="<?php echo esc_url( $edit_url ); ?>"><?php _ex( 'Edit Group', 'Edit Profile Fields Group', 'buddypress' ); ?></a>
 
 								<?php if ( $group->can_delete ) : ?>
 
 									<div class="delete-button">
-										<a class="confirm submitdelete deletion ajax-option-delete" href="users.php?page=bp-profile-setup&amp;mode=delete_group&amp;group_id=<?php echo esc_attr( $group->id ); ?>"><?php _ex( 'Delete Group', 'Delete Profile Fields Group', 'buddypress' ); ?></a>
+										<a class="confirm submitdelete deletion ajax-option-delete" href="<?php echo esc_url( $delete_url ); ?>"><?php _ex( 'Delete Group', 'Delete Profile Fields Group', 'buddypress' ); ?></a>
 									</div>
 
 								<?php endif; ?>
@@ -272,7 +294,7 @@
 				<?php endforeach; else : ?>
 
 					<div id="message" class="error"><p><?php _ex( 'You have no groups.', 'You have no profile fields groups.', 'buddypress' ); ?></p></div>
-					<p><a href="users.php?page=bp-profile-setup&amp;mode=add_group"><?php _ex( 'Add New Group', 'Add New Profile Fields Group', 'buddypress' ); ?></a></p>
+					<p><a href="<?php echo esc_url( $add_group_url ); ?>"><?php _ex( 'Add New Group', 'Add New Profile Fields Group', 'buddypress' ); ?></a></p>
 
 				<?php endif; ?>
 
Index: classes/class-bp-xprofile-field.php
===================================================================
--- classes/class-bp-xprofile-field.php	(revision 11580)
+++ classes/class-bp-xprofile-field.php	(working copy)
@@ -1147,7 +1147,11 @@
 	public function render_admin_form( $message = '' ) {
 		if ( empty( $this->id ) ) {
 			$title  = __( 'Add New Field', 'buddypress' );
-			$action	= "users.php?page=bp-profile-setup&amp;group_id=" . $this->group_id . "&amp;mode=add_field#tabs-" . $this->group_id;
+			$action = add_query_arg( array(
+				'page'     => 'bp-profile-setup',
+				'group_id' => urlencode( $this->group_id ),
+				'mode'     => 'add_field',
+			), bp_get_admin_url( 'users.php' ) . '#tabs-' . $this->group_id );
 			$button	= __( 'Save', 'buddypress' );
 
 			if ( !empty( $_POST['saveField'] ) ) {
@@ -1163,7 +1167,12 @@
 			}
 		} else {
 			$title  = __( 'Edit Field', 'buddypress' );
-			$action = "users.php?page=bp-profile-setup&amp;mode=edit_field&amp;group_id=" . $this->group_id . "&amp;field_id=" . $this->id . "#tabs-" . $this->group_id;
+			$action = add_query_arg( array(
+				'page'     => 'bp-profile-setup',
+				'group_id' => urlencode( $this->group_id ),
+				'field_id' => urlencode( $this->id ),
+				'mode'     => 'edit_field',
+			), bp_get_admin_url( 'users.php' ) . '#tabs-' . $this->group_id );
 			$button	= __( 'Update', 'buddypress' );
 		} ?>
 
@@ -1305,7 +1314,7 @@
 						<?php endif; ?>
 
 						<div id="delete-action">
-							<a href="users.php?page=bp-profile-setup" class="deletion"><?php esc_html_e( 'Cancel', 'buddypress' ); ?></a>
+							<a href="<?php echo esc_url( add_query_arg( 'page', 'bp-profile-setup', bp_get_admin_url( 'users.php' ) ) ); ?>" class="deletion"><?php esc_html_e( 'Cancel', 'buddypress' ); ?></a>
 						</div>
 
 						<?php wp_nonce_field( 'xprofile_delete_option' ); ?>
Index: classes/class-bp-xprofile-group.php
===================================================================
--- classes/class-bp-xprofile-group.php	(revision 11580)
+++ classes/class-bp-xprofile-group.php	(working copy)
@@ -719,13 +719,13 @@
 		// New field group.
 		if ( empty( $this->id ) ) {
 			$title	= __( 'Add New Field Group', 'buddypress' );
-			$action	= add_query_arg( array( 'page' => 'bp-profile-setup', 'mode' => 'add_group' ), 'users.php' );
+			$action	= add_query_arg( array( 'page' => 'bp-profile-setup', 'mode' => 'add_group' ), bp_get_admin_url( 'users.php' ) );
 			$button	= __( 'Save', 'buddypress' );
 
 		// Existing field group.
 		} else {
 			$title  = __( 'Edit Field Group', 'buddypress' );
-			$action	= add_query_arg( array( 'page' => 'bp-profile-setup', 'mode' => 'edit_group', 'group_id' => $this->id ), 'users.php' );
+			$action	= add_query_arg( array( 'page' => 'bp-profile-setup', 'mode' => 'edit_group', 'group_id' => $this->id ), bp_get_admin_url( 'users.php' ) );
 			$button	= __( 'Update', 'buddypress' );
 		} ?>
 
@@ -813,7 +813,7 @@
 												<input type="submit" name="save_group" value="<?php echo esc_attr( $button ); ?>" class="button-primary"/>
 											</div>
 											<div id="delete-action">
-												<a href="users.php?page=bp-profile-setup" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
+												<a href="<?php echo esc_url( add_query_arg( 'page', 'bp-profile-setup', bp_get_admin_url( 'users.php' ) ) ); ?>" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
 											</div>
 											<div class="clear"></div>
 										</div>
