diff --git a/includes/common/class-cpt.php b/includes/common/class-cpt.php
index 3151059e..47502e0d 100644
--- a/includes/common/class-cpt.php
+++ b/includes/common/class-cpt.php
@@ -18,6 +18,7 @@ if ( ! class_exists( 'um\common\CPT' ) ) {
 
 		public function hooks() {
 			add_action( 'init', array( &$this, 'create_post_types' ), 1 );
+			add_action( 'transition_post_status', array( &$this, 'change_default_form' ), 10, 3 );
 		}
 
 		/**
@@ -135,5 +136,115 @@ if ( ! class_exists( 'um\common\CPT' ) ) {
 			}
 			return $taxonomies;
 		}
+
+
+		/**
+		 * Update default forms
+		 *
+		 * @since 2.8.6
+		 *
+		 * @param string $new_status New post status
+		 * @param string $old_status Old post status
+		 * @param object $post Post object
+		 */
+		public function change_default_form( $new_status, $old_status, $post ) {
+			if ( 'um_form' === $post->post_type || 'um_directory' === $post->post_type ) {
+				$post_type = '';
+				$key       = '';
+				if ( 'um_form' === $post->post_type ) {
+					$key       = 'um_core_forms';
+					$post_type = 'um_form';
+				}
+				if ( 'um_directory' === $post->post_type ) {
+					$key       = 'um_core_directories';
+					$post_type = 'um_directory';
+				}
+				$core_ids = get_option( $key, array() );
+				$post_id  = $post->ID;
+
+				if ( 'publish' === get_post_status( $post_id ) ) {
+					if ( 'um_form' === $post->post_type ) {
+						$mode = sanitize_key( $_POST['form']['_um_mode'] ); // phpcs:ignore WordPress.Security.NonceVerification -- already verified here
+					}
+					if ( 'um_directory' === $post->post_type ) {
+						$mode = 'members';
+					}
+					if ( empty( $core_ids[ $mode ] ) || 'publish' !== get_post_status( $core_ids[ $mode ] ) ) {
+						$core_ids[ $mode ] = $post_id;
+
+						/**
+						 * Filters Ultimate Member default forms ids.
+						 *
+						 * @param {array}    $core_ids   Default ids.
+						 * @param {int}      $post_id    Deleted post ID.
+						 * @param {string}   $key    Post type key.
+						 *
+						 * @return {array} Default forms ids.
+						 *
+						 * @since 2.8.6
+						 * @hook um_default_forms_ids_on_create
+						 *
+						 * @example <caption>Set default profile form ID as 1.</caption>
+						 * function my_um_default_forms_ids_on_create( $core_forms, $form_id, $key ) {
+						 *     // your code here
+						 *     $core_forms['profile'] = 1;
+						 *     return $core_forms;
+						 * }
+						 * add_filter( 'um_default_forms_ids_on_create', 'my_um_default_forms_ids_on_create', 10, 3 );
+						 */
+						$core_ids = apply_filters( 'um_default_forms_ids_on_create', $core_ids, $post_id, $key );
+						update_option( $key, $core_ids, $key );
+					}
+				} elseif ( 'trash' === $new_status ) {
+					$meta_value_mode = get_post_meta( $post_id, '_um_mode', true );
+					$mode            = $meta_value_mode;
+					if ( 'um_directory' === $post->post_type ) {
+						$mode = 'members';
+					}
+					if ( isset( $mode ) && absint( $post_id ) === absint( $core_ids[ $mode ] ) ) {
+						$args = array(
+							'post_type'      => $post_type,
+							'meta_key'       => '_um_mode',
+							'meta_value'     => $meta_value_mode,
+							'posts_per_page' => 1,
+							'orderby'        => 'date',
+							'post_status'    => 'publish',
+							'order'          => 'DESC',
+							'fields'         => 'ids',
+							'post__not_in'   => array( $post_id ),
+						);
+
+						$forms = get_posts( $args );
+						if ( ! empty( $forms ) ) {
+							$new_post_id       = $forms[0];
+							$core_ids[ $mode ] = $new_post_id;
+
+							/**
+							 * Filters Ultimate Member default forms ids.
+							 *
+							 * @param {array}    $core_ids Default forms ids.
+							 * @param {int}      $post_id    Deleted psot ID.
+							 * @param {string}   $key    Post type key.
+							 *
+							 * @return {array} Default forms ids.
+							 *
+							 * @since 2.8.6
+							 * @hook um_default_forms_ids_on_delete
+							 *
+							 * @example <caption>Set default profile form ID as 1.</caption>
+							 * function my_um_default_forms_ids_on_delete( $core_ids, $form_id, $key ) {
+							 *     // your code here
+							 *     $core_ids['profile'] = 1;
+							 *     return $core_ids;
+							 * }
+							 * add_filter( 'um_default_forms_ids_on_delete', 'my_um_default_forms_ids_on_delete', 10, 3 );
+							 */
+							$core_ids = apply_filters( 'um_default_forms_ids_on_delete', $core_ids, $post_id, $key );
+							update_option( $key, $core_ids );
+						}
+					}
+				}
+			}
+		}
 	}
 }