diff --git a/js/qsm-admin.js b/js/qsm-admin.js
index 648a730dd..0ab7aade3 100644
--- a/js/qsm-admin.js
+++ b/js/qsm-admin.js
@@ -3784,7 +3784,7 @@ var import_button;
                         .done(function (pages) {
                             $('#results-pages').find('.qsm-spinner-loader').remove();
                             pages.forEach(function (page, i, pages) {
-                                QSMAdminResults.addResultsPage(page.conditions, page.page, page.redirect, page.default_mark);
+                                QSMAdminResults.addResultsPage(page.conditions, page.page, page.redirect, page.default_mark, page);
                             });
                             QSMAdmin.clearAlerts();
                         })
@@ -3820,7 +3820,7 @@ var import_button;
                 newCondition: function ($page) {
                     QSMAdminResults.addCondition($page, 'quiz', '', 'score', 'equal', 0);
                 },
-                addResultsPage: function (conditions, page, redirect, default_mark = false) {
+                addResultsPage: function (conditions, page, redirect, default_mark = false, singlePage = {}) {
                     const parser = new DOMParser();
                     let parseRedirect = parser.parseFromString(redirect, 'text/html');
                     redirect = parseRedirect.documentElement.textContent;
@@ -3849,7 +3849,7 @@ var import_button;
                     };
                     jQuery(document).trigger('qsm_tinyMCE_settings_after', [settings]);
                     wp.editor.initialize('results-page-' + QSMAdminResults.total, settings);
-                    jQuery(document).trigger('qsm_after_add_result_block', [conditions, page, redirect, QSMAdminResults.total]);
+                    jQuery(document).trigger('qsm_after_add_result_block', [conditions, page, redirect, QSMAdminResults.total, singlePage]);
                 },
                 newResultsPage: function () {
                     var conditions = [{
diff --git a/php/admin/options-page-contact-tab.php b/php/admin/options-page-contact-tab.php
index ed2309e87..d111a98f1 100644
--- a/php/admin/options-page-contact-tab.php
+++ b/php/admin/options-page-contact-tab.php
@@ -46,9 +46,6 @@ function qsm_options_contact_tab_content() {
 			<li>
 				<a href="javascript:void(0)" data-id="contact_form_option" class="quiz_style_tab"><?php esc_html_e( 'Options', 'quiz-master-next' ); ?></a>
 			</li>
-			<li>
-				<a href="javascript:void(0)" data-id="qsm-ultimate-quiz-settings" class="quiz_style_tab"><?php esc_html_e( 'Ultimate', 'quiz-master-next' ); ?></a>
-			</li>
 		</ul>
 	</div>
 	<div id="contact_form_setup" class="quiz_style_tab_content">
@@ -84,6 +81,7 @@ function qsm_options_contact_tab_content() {
 								<input type="radio" id="contact_info_location-1" name="contact_info_location" value="1" <?php checked( $quiz_options['contact_info_location'], '1', true )?>>
 								<?php esc_html_e( 'Show after the quiz ends', 'quiz-master-next' ); ?>
 							</label>
+							<?php do_action( 'qsm_contact_form_location_after', $quiz_options ); ?>
 						</fieldset>
 						<span class="qsm-opt-desc"><?php esc_html_e( 'Select where to display the contact form', 'quiz-master-next' ); ?></span>
 					</td>
@@ -146,11 +144,6 @@ function qsm_options_contact_tab_content() {
 			</tbody>
 		</table>
 	</div>
-	<?php if ( ! class_exists( 'QSM_Ultimate' ) ) : ?>
-	<div id="qsm-ultimate-quiz-settings" class="quiz_style_tab_content" style="display:none">
-	<?php qsm_ultimate_addon_upgrade_content(); ?>
-	</div>
-	<?php endif; ?>
 	<div class="contact-page-tab-footer">
 		<div class="footer-bar-notice"></div>
     	<a class="save-contact button-primary"><?php esc_html_e( 'Save Contact Form', 'quiz-master-next' ); ?></a>
diff --git a/php/admin/options-page-results-page-tab.php b/php/admin/options-page-results-page-tab.php
index 911729b1e..9eb255973 100644
--- a/php/admin/options-page-results-page-tab.php
+++ b/php/admin/options-page-results-page-tab.php
@@ -236,6 +236,7 @@ function qsm_options_results_tab_template(){
 							<!-- Conditions go here. Review template below. -->
 						</div>
 						<a class="qsm-new-condition qsm-block-btn qsm-dashed-btn" href="javascript:void(0);">+ <?php esc_html_e( 'Add condition', 'quiz-master-next' ); ?></a>
+						<?php do_action( 'qsm_result_page_condition_after',  $quiz_id, $categories ); ?>
 					</div>
 					<div class="results-page-show">
 						<div class="results-page-content-header">
diff --git a/php/classes/class-qsm-fields.php b/php/classes/class-qsm-fields.php
index f1de1cb3c..6c775ca52 100644
--- a/php/classes/class-qsm-fields.php
+++ b/php/classes/class-qsm-fields.php
@@ -91,6 +91,10 @@ public static function generate_section( $fields, $section ) {
 			$quiz_id = isset( $_GET["quiz_id"] ) ? intval( $_GET["quiz_id"] ) : 0;
 			// Update the settings and show alert based on outcome
 			$settings_array = wp_parse_args( $settings_array, $settings_array_before_update );
+			$settings_array['contact_info_location'] = ! isset($settings_array['contact_info_location']) || '' == $settings_array['contact_info_location'] ? $settings_array_before_update['contact_info_location'] : $settings_array['contact_info_location'];
+			$settings_array['loggedin_user_contact'] = ! isset($settings_array['loggedin_user_contact']) || '' == $settings_array['loggedin_user_contact'] ? $settings_array_before_update['loggedin_user_contact'] : $settings_array['loggedin_user_contact'];
+			$settings_array['contact_disable_autofill'] = ! isset($settings_array['contact_disable_autofill']) || '' == $settings_array['contact_disable_autofill'] ? $settings_array_before_update['contact_disable_autofill'] : $settings_array['contact_disable_autofill'];
+			$settings_array['disable_first_page'] = ! isset($settings_array['disable_first_page']) || '' == $settings_array['disable_first_page'] ? $settings_array_before_update['disable_first_page'] : $settings_array['disable_first_page'];
 			$results = $mlwQuizMasterNext->pluginHelper->update_quiz_setting( $section, $settings_array );
 			if ( false !== $results ) {
 				do_action( 'qsm_saved_quiz_settings', $quiz_id, $section, $settings_array );
diff --git a/php/classes/class-qsm-results-pages.php b/php/classes/class-qsm-results-pages.php
index 88d610608..2f7d6e465 100644
--- a/php/classes/class-qsm-results-pages.php
+++ b/php/classes/class-qsm-results-pages.php
@@ -140,6 +140,7 @@ public static function generate_pages( $response_data ) {
 						 * DO NOT RETURN TRUE IF IT PASSES THE CONDITION!!!
 						 * The value may have been set to false when failing a previous condition.
 						 */
+						$response_data['result_page_index'] = $index;
 						$show = apply_filters( 'qsm_results_page_condition_check', $show, $condition, $response_data );
 						if ( ! $show ) {
 							break;