diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 4f747a2a..2343a7d2 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -573,7 +573,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 			} elseif ( um_user( $key ) && $this->editing == true ) {
 
-				if ( strstr( $key, 'user_pass' ) ) {
+				//show empty value for password fields
+				if ( strstr( $key, 'user_pass' ) || $type == 'password' ) {
 					return '';
 				}
 
@@ -3472,9 +3473,12 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 			if (isset( $data['in_group'] ) && $data['in_group'] != '' && $rule != 'group') return;
 
-			if ($visibility == 'edit') return;
+			if ( $visibility == 'edit' ) return;
 
-			if (in_array( $type, array( 'block', 'shortcode', 'spacing', 'divider', 'group' ) )) {
+			//invisible on profile page
+			if ( $type == 'password' ) return;
+
+			if ( in_array( $type, array( 'block', 'shortcode', 'spacing', 'divider', 'group' ) ) ) {
 
 			} else {
 
diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index 912be967..8d064021 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -218,6 +218,7 @@ function um_user_edit_profile( $args ) {
 
 	// loop through fields
 	if ( ! empty( $fields ) ) {
+
 		foreach ( $fields as $key => $array ) {
 
 			/*if ( ! um_can_edit_field( $fields[ $key ] ) )
@@ -239,10 +240,15 @@ function um_user_edit_profile( $args ) {
 
 				} else {
 
-					if ( isset( $userinfo[ $key ] ) && $args['submitted'][ $key ] != $userinfo[ $key ] ) {
-						$to_update[ $key ] = $args['submitted'][ $key ];
-					} elseif ( $args['submitted'][ $key ] ) {
-						$to_update[ $key ] = $args['submitted'][ $key ];
+					if ( $array['type'] == 'password' ) {
+						$to_update[ $key ] = wp_hash_password( $args['submitted'][ $key ] );
+						$args['submitted'][ $key ] = sprintf( __( 'Your choosed %s', 'ultimate-member' ), $array['title'] );
+					} else {
+						if ( isset( $userinfo[ $key ] ) && $args['submitted'][ $key ] != $userinfo[ $key ] ) {
+							$to_update[ $key ] = $args['submitted'][ $key ];
+						} elseif ( $args['submitted'][ $key ] ) {
+							$to_update[ $key ] = $args['submitted'][ $key ];
+						}
 					}
 
 				}