- fixed displaying different profile form shortcodes with different role visibility settings on the same page;

- fixed displaying avatar on the logout page;

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' ) ) {
 		}
 
 	}
-}
+}

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>
+</div>