diff --git a/inc/api/class-opalestate-base-api.php b/inc/api/class-opalestate-base-api.php
index d52f9aef..e37843a6 100644
--- a/inc/api/class-opalestate-base-api.php
+++ b/inc/api/class-opalestate-base-api.php
@@ -195,7 +195,7 @@ abstract class Opalestate_Base_API {
 			$endpoint = explode( '/', $route );
 			$endpoint = end( $endpoint );
 
-			if ( in_array( $endpoint, [ 'properties', 'agencies', 'agents', 'search-form' ] ) ) {
+			if ( in_array( $endpoint, [ 'properties', 'agencies', 'agents', 'search-form', 'search' ] ) ) {
 				return true;
 			}
 
diff --git a/inc/user/functions.php b/inc/user/functions.php
index 9a509d4c..f91c1ca4 100755
--- a/inc/user/functions.php
+++ b/inc/user/functions.php
@@ -218,7 +218,7 @@ function opalestate_management_user_menu_tabs() {
 			$link = $uri . '?tab=' . $item['link'];
 		}
 
-		$output .= '<li class="account-links-item' . ( $current_tab == $item['link'] ? ' active' : '' ) . '"><a href="' . $link . '"><i class="' . $item['icon'] . '"></i> ' . $item['title'] . '</a></li>';
+		$output .= '<li class="account-links-item ' . $key . ( $current_tab == $item['link'] ? ' active' : '' ) . '"><a href="' . $link . '"><i class="' . $item['icon'] . '"></i> ' . $item['title'] . '</a></li>';
 	}
 
 	$output .= '<li><a href="' . wp_logout_url( home_url( '/' ) ) . '"> <i class="fa fa-unlock"></i> ' . esc_html__( 'Log out', 'opalestate-pro' ) . '</a></li>';
diff --git a/templates/user-management.php b/templates/user-management.php
index a7c7b8e6..d7dc950c 100755
--- a/templates/user-management.php
+++ b/templates/user-management.php
@@ -19,6 +19,8 @@ if ( ! class_exists( 'OpalEstate_User' ) ) {
 
 $user_id      = get_current_user_id();
 $current_user = wp_get_current_user();
+$roles = $current_user->roles;
+$roles_classes = implode( ' ', array_map( 'sanitize_html_class', $roles ) )
 
 ?>
 <?php if ( $user_id ): ?>
@@ -60,7 +62,7 @@ $current_user = wp_get_current_user();
         </div>
     </div>
 
-    <div class="wrapper opalestate-user-management" id="opalestate-user-management">
+    <div class="wrapper opalestate-user-management <?php echo esc_attr( $roles_classes ); ?>" id="opalestate-user-management">
         <div class="container" id="content">
             <div class="opal-row-inner">
                 <div class=" user-dasboard-sidebar">
@@ -132,7 +134,7 @@ $current_user = wp_get_current_user();
 	<?php get_footer( 'header/no-sidebar' ); ?>
 <?php else : ?>
 	<?php get_header(); ?>
-    <div class="wrapper opalestate-user-management" id="opalestate-user-management">
+    <div class="wrapper opalestate-user-management <?php echo esc_attr( $roles_classes ); ?>" id="opalestate-user-management">
         <div class="container">
             <div class="opalestate-panel-myaccount">
                 <div class="management-header text-center">