diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index ae31c36e..2afbcee4 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -717,7 +717,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 							}
 
 							$this->profile_role = $args['role'];
-						} else {
+						} elseif ( $this->profile_role != $args['role'] ) {
 							ob_get_clean();
 							return '';
 						}
@@ -1307,4 +1307,4 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 		}
 
 	}
-}
\ No newline at end of file
+}
diff --git a/templates/logout.php b/templates/logout.php
index 897d16bf..6239943f 100644
--- a/templates/logout.php
+++ b/templates/logout.php
@@ -8,7 +8,7 @@
 
 			<div class="um-misc-img">
 				<a href="<?php echo esc_url( um_get_core_page( 'user' ) ); ?>">
-					<?php echo um_user( 'profile_photo', 80 ); ?>
+					<?php echo get_avatar( um_user( 'ID' ), 80 ) ?>
 				</a>
 			</div>
 			
@@ -64,4 +64,4 @@
 		
 		</ul>
 	</div>
-</div>
\ No newline at end of file
+</div>