diff --git a/includes/admin/core/class-admin-builder.php b/includes/admin/core/class-admin-builder.php
index 8300d00e..82c45c5b 100644
--- a/includes/admin/core/class-admin-builder.php
+++ b/includes/admin/core/class-admin-builder.php
@@ -678,8 +678,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
 				$save[ $_metakey ] = null;
 				foreach ( $array['post'] as $key => $val ) {
 
-					if ( substr( $key, 0, 1 ) === '_' && $val != '' ) { // field attribute
-						$new_key = ltrim ($key,'_');
+					if ( substr( $key, 0, 1 ) === '_' && $val !== '' ) { // field attribute
+						$new_key = ltrim ( $key, '_' );
 
 						if ( $new_key == 'options' ) {
 							//$save[ $_metakey ][$new_key] = explode(PHP_EOL, $val);
@@ -689,6 +689,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
 						}
 
 					} elseif ( strstr( $key, 'um_editor' ) ) {
+
 						if ( 'block' === $array['post']['_type'] ) {
 							$save[ $_metakey ]['content'] = wp_kses_post( $val );
 						} else {
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index b9981db4..acb1d50c 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -3783,11 +3783,15 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		/**
 		 * Get fields in row
 		 *
-		 * @param  integer $row_id
+		 * @param int $row_id
 		 *
 		 * @return string
 		 */
 		function get_fields_by_row( $row_id ) {
+			if ( ! isset( $this->get_fields ) ) {
+				return '';
+			}
+
 			foreach ( $this->get_fields as $key => $array ) {
 				if ( ! isset( $array['in_row'] ) || ( isset( $array['in_row'] ) && $array['in_row'] == $row_id ) ) {
 					$results[ $key ] = $array;
diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php
index 2f871f5e..56f96180 100644
--- a/includes/um-short-functions.php
+++ b/includes/um-short-functions.php
@@ -697,6 +697,7 @@ function um_user_submitted_registration_formatted( $style = false ) {
 
 		if ( isset( $submitted_data['form_id'] ) ) {
 			$fields = UM()->query()->get_attr( 'custom_fields', $submitted_data['form_id'] );
+			$fields = maybe_unserialize( $fields );
 		}
 
 		if ( isset( $fields ) ) {
@@ -717,10 +718,10 @@ function um_user_submitted_registration_formatted( $style = false ) {
 			if ( empty( $rows ) ) {
 				$rows = array(
 					'_um_row_1' => array(
-						'type'      => 'row',
-						'id'        => '_um_row_1',
-						'sub_rows'  => 1,
-						'cols'      => 1
+						'type'     => 'row',
+						'id'       => '_um_row_1',
+						'sub_rows' => 1,
+						'cols'     => 1,
 					),
 				);
 			}