diff --git a/templates/gdpr-register.php b/templates/gdpr-register.php
index e1537693..ca0f790a 100644
--- a/templates/gdpr-register.php
+++ b/templates/gdpr-register.php
@@ -7,64 +7,66 @@
  * Page: "Register"
  * Call: function display_option()
  *
- * @version 2.6.1
+ * @version 2.9.3
  *
  * @var object $um_content_query
  * @var array  $args
  */
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 // The "Privacy Policy" field content can not contain forms.
 $allowed_html = UM()->get_allowed_html( 'templates' );
 unset( $allowed_html['form'] );
+
+$content = '';
+if ( ! empty( $args['use_gdpr_content_id'] ) ) {
+	$um_content_query = get_post( $args['use_gdpr_content_id'] );
+	if ( ! empty( $um_content_query ) && ! is_wp_error( $um_content_query ) ) {
+		$content = apply_filters( 'um_gdpr_policies_page_content', $um_content_query->post_content, $args );
+		$content = apply_filters( 'the_content', $content, $um_content_query->ID );
+	}
+}
+
+$toggle_show  = ! empty( $args['use_gdpr_toggle_show'] ) ? $args['use_gdpr_toggle_show'] : __( 'Show privacy policy', 'ultimate-member' );
+$toggle_hide  = ! empty( $args['use_gdpr_toggle_hide'] ) ? $args['use_gdpr_toggle_hide'] : __( 'Hide privacy policy', 'ultimate-member' );
+$toggle_title = ! empty( $args['use_gdpr_toggle_show'] ) ? $args['use_gdpr_toggle_show'] : __( 'Show privacy policy', 'ultimate-member' );
+$confirm      = ! empty( $args['use_gdpr_agreement'] ) ? $args['use_gdpr_agreement'] : __( 'Please confirm that you agree to our privacy policy', 'ultimate-member' );
+
+$form_errors   = UM()->form()->errors;
+$error_message = ! empty( $args['use_gdpr_error_text'] ) ? $args['use_gdpr_error_text'] : __( 'Please confirm your acceptance of our privacy policy', 'ultimate-member' );
 ?>
 
 <!-- This file should primarily consist of HTML with a little bit of PHP. -->
 <div class="um-field um-field-type_terms_conditions" data-key="use_terms_conditions_agreement" style="display:block;padding:0;">
 	<div class="um-field-area">
 		<div class="um-gdpr-content" style="display:none;">
-			<?php if ( ! empty( $args['use_gdpr_content_id'] ) ) {
-				$um_content_query = get_post( $args['use_gdpr_content_id'] );
-				if ( ! empty( $um_content_query ) && ! is_wp_error( $um_content_query ) ) {
-					$content = apply_filters( 'um_gdpr_policies_page_content', $um_content_query->post_content, $args );
-					echo wp_kses( apply_filters( 'the_content', $content, $um_content_query->ID ), $allowed_html );
-				}
-			} ?>
+			<?php
+			if ( ! empty( $content ) ) {
+				echo wp_kses( $content, $allowed_html );
+			}
+			?>
 		</div>
-
-		<?php $toggle_show = ! empty( $args['use_gdpr_toggle_show'] ) ? $args['use_gdpr_toggle_show'] : __( 'Show privacy policy', 'ultimate-member' );
-		$toggle_hide = ! empty( $args['use_gdpr_toggle_hide'] ) ? $args['use_gdpr_toggle_hide'] : __( 'Hide privacy policy', 'ultimate-member' );
-		$toggle_title = ! empty( $args['use_gdpr_toggle_show'] ) ? $args['use_gdpr_toggle_show'] : __( 'Show privacy policy', 'ultimate-member' ); ?>
-
 		<a href="javascript:void(0);" class="um-toggle-gdpr" data-toggle-state="hidden"
-		   data-toggle-show="<?php echo esc_attr( $toggle_show ); ?>"
-		   data-toggle-hide="<?php echo esc_attr( $toggle_hide ); ?>">
+			data-toggle-show="<?php echo esc_attr( $toggle_show ); ?>"
+			data-toggle-hide="<?php echo esc_attr( $toggle_hide ); ?>">
 			<?php echo esc_html( $toggle_title ); ?>
 		</a>
 	</div>
 	<div class="um-field-area">
-
-		<?php $confirm = ! empty( $args['use_gdpr_agreement'] ) ? $args['use_gdpr_agreement'] :  __( 'Please confirm that you agree to our privacy policy', 'ultimate-member' ); ?>
-
 		<label class="um-field-checkbox">
 			<input type="checkbox" name="use_gdpr_agreement" value="1">
 			<span class="um-field-checkbox-state"><i class="um-icon-android-checkbox-outline-blank"></i></span>
 			<span class="um-field-checkbox-option"><?php echo esc_html( $confirm ); ?></span>
 		</label>
 		<div class="um-clear"></div>
-
-		<?php $errors = UM()->form()->errors;
-
-		if ( isset( $errors['use_gdpr_agreement'] ) ) {
-
-			$error_message = ! empty( $args['use_gdpr_error_text'] ) ? $args['use_gdpr_error_text'] :  __( 'Please confirm your acceptance of our privacy policy', 'ultimate-member' ); ?>
-
+		<?php if ( isset( $form_errors['use_gdpr_agreement'] ) ) { ?>
 			<p class="um-notice err">
-				<i class="um-icon-ios-close-empty" onclick="jQuery(this).parent().fadeOut();"></i><?php echo esc_html( $error_message ) ?>
+				<i class="um-icon-ios-close-empty" onclick="jQuery(this).parent().fadeOut();"></i><?php echo esc_html( $error_message ); ?>
 			</p>
 			<br/>
 		<?php } ?>
-
 		<div class="um-clear"></div>
 	</div>
 </div>