diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 24ac5964..fc025cb0 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -477,6 +477,12 @@
 
 					return $value;
 
+				} else if( isset( UM()->user()->profile[$key] ) ){
+
+					$value = UM()->user()->profile[$key];
+					$value = apply_filters( "um_edit_{$key}_field_value", $value, $key );
+					return $value;
+
 				} else if ($default) {
 
 					$default = apply_filters( "um_field_default_value", $default, $data, $type );
@@ -2594,7 +2600,10 @@
 				if (in_array( $type, array( 'block', 'shortcode', 'spacing', 'divider', 'group' ) )) {
 
 				} else {
-					if (!$this->field_value( $key, $default, $data )) return;
+
+					$_field_value = $this->field_value( $key, $default, $data );
+
+					if ( ! isset($_field_value) || $_field_value == '') return;
 				}
 
 				if (!um_can_view_field( $data )) return;