diff --git a/includes/core/class-account.php b/includes/core/class-account.php
index dd685573..1128a08e 100644
--- a/includes/core/class-account.php
+++ b/includes/core/class-account.php
@@ -312,30 +312,31 @@ if ( ! class_exists( 'um\core\Account' ) ) {
 		/**
 		 * Restrict access to Account page
 		 */
-		function account_page_restrict() {
-
+		public function account_page_restrict() {
 			if ( um_is_core_page( 'account' ) ) {
 
-				//redirect to login for not logged in users
+				// Redirect to the login page for not logged-in users.
 				if ( ! is_user_logged_in() ) {
 					$redirect_to = add_query_arg(
 						'redirect_to',
-						urlencode_deep( um_get_core_page( 'account' ) ) ,
+						urlencode_deep( um_get_core_page( 'account' ) ),
 						um_get_core_page( 'login' )
 					);
 
-					exit( wp_redirect( $redirect_to ) );
+					wp_safe_redirect( $redirect_to );
+					exit;
 				}
 
-
-				//set data for fields
-				UM()->fields()->set_mode = 'account';
-				UM()->fields()->editing = true;
+				// Set data for fields.
+				UM()->fields()->set_mode    = 'account';
+				UM()->fields()->editing     = true;
+				UM()->fields()->global_args = array(
+					'mode' => 'account',
+				);
 
 				if ( get_query_var( 'um_tab' ) ) {
 					$this->current_tab = get_query_var( 'um_tab' );
 				}
-
 			}
 		}
 
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 074e17ff..0b148a19 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -4354,7 +4354,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$show_bio       = false;
 							$bio_html       = false;
 							$global_setting = UM()->options()->get( 'profile_show_html_bio' );
-							if ( 'profile' === $this->global_args['mode'] ) {
+							if ( isset( $this->global_args['mode'] ) && 'profile' === $this->global_args['mode'] ) {
 								if ( ! empty( $this->global_args['use_custom_settings'] ) ) {
 									if ( ! empty( $this->global_args['show_bio'] ) ) {
 										$show_bio = true;