diff --git a/.gitignore b/.gitignore
index 15f1d37e..1cca15a3 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .idea/
 .sass-cache/
-.node_modules/**
\ No newline at end of file
+node_modules/**
\ No newline at end of file
diff --git a/assets/opalestate.css b/assets/opalestate.css
index b0895163..2592ba9a 100755
--- a/assets/opalestate.css
+++ b/assets/opalestate.css
@@ -3640,10 +3640,16 @@ header#masthead {
 .opalestate-user-greeting .popup-head a {
   color: #FFF;
   text-align: right;
+  float: right;
   position: relative; }
-  .opalestate-user-greeting .popup-head a img {
+  .opalestate-user-greeting .popup-head a .opalestate-user-image {
+    position: relative;
     width: 40px;
-    border-radius: 50%; }
+    height: 40px; }
+    .opalestate-user-greeting .popup-head a .opalestate-user-image img {
+      min-height: 40px;
+      object-fit: cover;
+      border-radius: 50%; }
   .opalestate-user-greeting .popup-head a i {
     padding: 12px;
     border-radius: 50%;
diff --git a/assets/scss/opalestate/_dashboard.scss b/assets/scss/opalestate/_dashboard.scss
index 28a26086..19e075a1 100755
--- a/assets/scss/opalestate/_dashboard.scss
+++ b/assets/scss/opalestate/_dashboard.scss
@@ -85,11 +85,17 @@
 	.popup-head a { 
 		color:$white; 
 		text-align:right;
-		img {
-			width:40px;
-			border-radius:50%;
-		}
-		position:relative;
+        float:right;
+        position:relative;
+        .opalestate-user-image {
+          position: relative;
+          @include size(40px, 40px);
+          img {
+            min-height: 40px;
+            object-fit: cover;
+            border-radius:50%;
+          }
+        }
 		i { 
 			padding:12px; 
 			border-radius:50%;
diff --git a/templates/user-management.php b/templates/user-management.php
index de003d59..c3645f57 100755
--- a/templates/user-management.php
+++ b/templates/user-management.php
@@ -53,8 +53,11 @@ get_header( 'no-sidebar' );
                     <li>
                         <div class="opalestate-user-greeting opalestate-popup hover-align-right">
                             <div class="popup-head"><a href="#"><?php $user_id = get_current_user_id(); ?>
-                                    <img src="<?php echo OpalEstate_User::get_author_picture( $user_id ); ?>" alt="<?php esc_attr_e( 'User Avatar', 'opalestate-pro' ); ?>"/>
+                                    <div class="opalestate-user-image">
+                                        <img src="<?php echo esc_url( OpalEstate_User::get_author_picture( $user_id ) ); ?>" alt="<?php esc_attr_e( 'Avatar image', 'opalestate-pro' ); ?>"/>
+                                    </div>
                                     <span class="notify active"></span>
+
                                 </a>
                             </div>
                             <div class="popup-body">