diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 2dca5cd4..c73a47df 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -591,25 +591,26 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		 * @return mixed
 		 */
 		function field_value( $key, $default = false, $data = null ) {
+			// preview in backend
+			if ( isset( UM()->user()->preview ) && UM()->user()->preview ) {
+				if ( $this->set_mode == 'login' || $this->set_mode == 'register' ) {
+					return '';
+				} else {
+					$val = um_user( $key );
+					if ( ! empty( $val ) ) {
+						return $val;
+					} else {
+						return '';
+					}
+				}
+			}
 
-			if( defined('DOING_AJAX') && DOING_AJAX ) return '';
-			
 			if ( isset( $_SESSION ) && isset( $_SESSION['um_social_profile'][ $key ] ) && isset( $this->set_mode ) && $this->set_mode == 'register' ) {
 				return $_SESSION['um_social_profile'][ $key ];
 			}
 
 			$type = ( isset( $data['type'] ) ) ? $data['type'] : '';
 
-			// preview in backend
-			if ( isset( UM()->user()->preview ) && UM()->user()->preview ) {
-				$submitted = um_user( 'submitted' );
-				if ( ! empty( $submitted[ $key ] ) ) {
-					return $submitted[ $key ];
-				} else {
-					return __( 'Undefined', 'ultimate-member' );
-				}
-			}
-
 			// normal state
 			if ( isset( UM()->form()->post_form[ $key ] ) ) {
 				//show empty value for password fields
@@ -1928,11 +1929,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			um_fetch_user( $_um_profile_id );
 
 			// do not show passwords
-			if ( isset( UM()->user()->preview ) && UM()->user()->preview && ! is_admin() ) {
-				if ( $data['type'] == 'password' ) {
-					return '';
-				}
-			}
+//			if ( isset( UM()->user()->preview ) && UM()->user()->preview /*&& ! is_admin()*/ ) {
+//				if ( $data['type'] == 'password' ) {
+//					return '';
+//				}
+//			}
 
 			// Stop return empty values build field attributes:
 
diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index baf88cdf..808490b5 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -134,7 +134,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 		 * @return array
 		 */
 		function display_logout_form( $args ) {
-			if ( is_user_logged_in() && isset( $args['mode'] ) && $args['mode'] == 'login' && ! is_admin() ) {
+			if ( is_user_logged_in() && isset( $args['mode'] ) && $args['mode'] == 'login' ) {
+
+				if ( isset( UM()->user()->preview ) && UM()->user()->preview ) {
+					return $args;
+				}
 
 				if ( get_current_user_id() != um_user( 'ID' ) ) {
 					um_fetch_user( get_current_user_id() );
diff --git a/includes/core/um-actions-login.php b/includes/core/um-actions-login.php
index 0dd4cc4c..f73f0c73 100644
--- a/includes/core/um-actions-login.php
+++ b/includes/core/um-actions-login.php
@@ -325,7 +325,7 @@ add_action( 'um_submit_form_login', 'um_submit_form_login', 10 );
  */
 function um_add_submit_button_to_login( $args ) {
 	// DO NOT add when reviewing user's details
-	if ( UM()->user()->preview == true && ! is_admin() ) {
+	if ( isset( UM()->user()->preview ) && UM()->user()->preview /*== true && ! is_admin()*/ ) {
 		return;
 	}