diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index df1581ee..8ac7a11a 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -2917,7 +2917,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$um_field_checkbox_item_title = $v;
 							$option_value = $v;
 
-							if ( ! is_numeric( $k ) && in_array( $form_key, array( 'role' ) ) ) {
+							if ( ! is_numeric( $k ) && in_array( $form_key, array( 'role' ) ) ||
+							     ( $this->set_mode == 'account' || um_is_core_page( 'account' ) ) ) {
 								$um_field_checkbox_item_title = $v;
 								$option_value = $k;
 							}
diff --git a/ultimate-member.php b/ultimate-member.php
index 5d5c23ef..514e7557 100644
--- a/ultimate-member.php
+++ b/ultimate-member.php
@@ -3,7 +3,7 @@
 Plugin Name: Ultimate Member
 Plugin URI: http://ultimatemember.com/
 Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress
-Version: 2.0.21
+Version: 2.0.22-alpha1
 Author: Ultimate Member
 Author URI: http://ultimatemember.com/
 Text Domain: ultimate-member