diff --git a/core/um-filters-account.php b/core/um-filters-account.php
index 4d895284..1193009a 100644
--- a/core/um-filters-account.php
+++ b/core/um-filters-account.php
@@ -42,9 +42,17 @@
 	add_filter('um_account_secure_fields','um_account_secure_fields', 10, 2);
 	function um_account_secure_fields( $fields, $tab_key ){
 
-		$_SESSION['um_account_fields'][ $tab_key ] = $fields; 
+		$secure = apply_filters('um_account_secure_fields__enabled', true );
 
-		update_user_meta( um_user('ID'), 'um_account_secure_fields', $_SESSION['um_account_fields'] );
+		if( ! $secure ) return $fields;
+
+		if( ! isset( $_SESSION['um_account_fields'] ) || ! isset( $_SESSION['um_account_fields'][ $tab_key ] ) ){
+			
+			$_SESSION['um_account_fields'][ $tab_key ] = $fields; 
+
+			update_user_meta( um_user('ID'), 'um_account_secure_fields', $_SESSION['um_account_fields'] );
+		
+		}
 		
 		return $fields;
 	}
\ No newline at end of file