diff --git a/inc/template-hook-functions.php b/inc/template-hook-functions.php
index 8425c4f4..56bf6d48 100755
--- a/inc/template-hook-functions.php
+++ b/inc/template-hook-functions.php
@@ -219,7 +219,13 @@ add_action( 'opalestate_single_property_preview', 'opalestate_property_preview',
 
 function opalestate_property_request_viewing_button( $islink = false ) {
 	$class = $islink ? 'btn-link' : 'btn btn-primary';
-	echo '<a href="#opalestate-user-form-popup" class="' . $class . ' btn-request-viewing opalestate-popup-button" data-target="#property-request-view-popup" >
+	if ( ! is_user_logged_in() ) {
+		$class .= ' opalestate-need-login';
+	} else {
+		$class .= ' opalestate-popup-button';
+	}
+
+	echo '<a href="#opalestate-user-form-popup" class="' . $class . ' btn-request-viewing" data-target="#property-request-view-popup" >
     <i class="fa fa-calendar-check-o"></i>
     <span class="btn-request-viewing__text">' . esc_html__( 'Request Viewing', 'opalestate-pro' ) . '</span>
     </a>';
@@ -254,6 +260,10 @@ add_action( 'opalestate_single_property_layout', 'opalestate_single_property_lay
  * Forms
  */
 function opalestate_property_request_view_form() {
+	if ( ! is_user_logged_in() ) {
+		return;
+	}
+
 	if ( ! is_single_property() ) {
 		return;
 	}
diff --git a/inc/vendors/opalmembership/membership.php b/inc/vendors/opalmembership/membership.php
index 5796386b..e64fa2d4 100755
--- a/inc/vendors/opalmembership/membership.php
+++ b/inc/vendors/opalmembership/membership.php
@@ -89,7 +89,7 @@ class OpalEstate_Membership {
 			add_action( 'opalmembership_dashboard_container_before', [ __CLASS__, 'check_membership_validation_message' ] );
 			// included logic functions
 
-			require_once( 'free-package.php' );
+			// require_once( 'free-package.php' );
 			require_once( 'functions.php' );
 
 			add_action( 'opalmembership_current_package_summary_after', [ __CLASS__, 'render_membership_summary' ], 10, 2 );