diff --git a/includes/admin/assets/js/um-admin-modal.js b/includes/admin/assets/js/um-admin-modal.js
index d12b0fee..3e566dce 100644
--- a/includes/admin/assets/js/um-admin-modal.js
+++ b/includes/admin/assets/js/um-admin-modal.js
@@ -153,6 +153,19 @@ function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
 function um_admin_modal_responsive() {
 	var required_margin = jQuery('.um-admin-modal:visible').innerHeight() / 2 + 'px';
 	jQuery('.um-admin-modal:visible').css({'margin-top': '-' + required_margin });
+
+	if ( jQuery('#UM_preview_form .um-s1').length ) {
+		jQuery("#UM_preview_form .um-s1").select2({
+			allowClear: true
+		});
+	}
+
+	if ( jQuery('#UM_preview_form .um-s2').length ) {
+		jQuery("#UM_preview_form .um-s2").select2({
+			allowClear: false,
+			minimumResultsForSearch: 10
+		});
+	}
 }
 
 function um_admin_remove_modal() {
diff --git a/includes/admin/core/class-admin-builder.php b/includes/admin/core/class-admin-builder.php
index f3ac2582..803b71a2 100644
--- a/includes/admin/core/class-admin-builder.php
+++ b/includes/admin/core/class-admin-builder.php
@@ -1046,13 +1046,15 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
 
 				case 'um_admin_preview_form':
 
+					UM()->user()->preview = true;
+
 					$mode = UM()->query()->get_attr('mode', $arg1 );
 
 					if ( $mode == 'profile' ) {
 						UM()->fields()->editing = true;
 					}
 
-					$output = do_shortcode('[ultimatemember form_id='.$arg1.']');
+					$output = do_shortcode('[ultimatemember form_id="' . $arg1 . '" /]');
 
 					break;
 
diff --git a/includes/admin/core/class-admin-enqueue.php b/includes/admin/core/class-admin-enqueue.php
index c9d7ff31..b3e9d6f0 100644
--- a/includes/admin/core/class-admin-enqueue.php
+++ b/includes/admin/core/class-admin-enqueue.php
@@ -141,7 +141,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
 			wp_register_script( 'um_modal', $this->front_js_baseurl . 'um-modal' . $this->suffix . '.js', array( 'um_responsive' ), ultimatemember_version, true );
 
 
-
+			wp_register_style( 'select2', $this->front_css_baseurl . 'select2/select2.min.css', array(), ultimatemember_version );
 			wp_register_style( 'um_datetime', $this->front_css_baseurl . 'pickadate/default.css', array(), ultimatemember_version );
 			wp_register_style( 'um_datetime_date', $this->front_css_baseurl . 'pickadate/default.date.css', array( 'um_datetime' ), ultimatemember_version );
 			wp_register_style( 'um_datetime_time', $this->front_css_baseurl . 'pickadate/default.time.css', array( 'um_datetime' ), ultimatemember_version );
@@ -156,7 +156,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
 			wp_register_style( 'um_profile', $this->front_css_baseurl . 'um-profile.css', array(), ultimatemember_version );
 			wp_register_style( 'um_account', $this->front_css_baseurl . 'um-account.css', array(), ultimatemember_version );
 			wp_register_style( 'um_misc', $this->front_css_baseurl . 'um-misc.css', array(), ultimatemember_version );
-			wp_register_style( 'um_default_css', $this->front_css_baseurl . 'um-old-default.css', array( 'um_crop', 'um_tipsy', 'um_raty', 'um_responsive', 'um_modal', 'um_styles', 'um_members', 'um_profile', 'um_account', 'um_misc', 'um_datetime_date', 'um_datetime_time', 'um_scrollbar' ), ultimatemember_version );
+			wp_register_style( 'um_default_css', $this->front_css_baseurl . 'um-old-default.css', array( 'um_crop', 'um_tipsy', 'um_raty', 'um_responsive', 'um_modal', 'um_styles', 'um_members', 'um_profile', 'um_account', 'um_misc', 'um_datetime_date', 'um_datetime_time', 'um_scrollbar', 'select2' ), ultimatemember_version );
 
 			wp_enqueue_script( 'um_modal' );
 			wp_enqueue_style( 'um_default_css' );
diff --git a/templates/profile.php b/templates/profile.php
index 0a2510a0..59c39b13 100644
--- a/templates/profile.php
+++ b/templates/profile.php
@@ -142,7 +142,7 @@
 		 */
 		do_action( 'um_profile_menu', $args );
 
-		if ( um_is_on_edit_profile() ) {
+		if ( um_is_on_edit_profile() || UM()->user()->preview ) {
 
 			$nav = 'main';
 			$subnav = UM()->profile()->active_subnav();
@@ -196,9 +196,12 @@
 				<div class="clear"></div>
 			</div>
 
-		</form>
+			<?php if ( ! UM()->user()->preview ) { ?>
 
-		<?php } else {
+			</form>
+
+			<?php }
+		} else {
 			$menu_enabled = UM()->options()->get( 'profile_menu' );
 			$tabs = UM()->profile()->tabs_active();