diff --git a/aad-sso-wordpress.php b/aad-sso-wordpress.php
index 0cda951..f8a3362 100644
--- a/aad-sso-wordpress.php
+++ b/aad-sso-wordpress.php
@@ -325,6 +325,13 @@ function get_wp_user_from_aad_user( $jwt ) {
 						'aad-sso-wordpress' )
 				);
 		}
+		
+		// Check if unique name is a reasonable email address
+		$bad_char = strpos($unique_name, "#");
+		if ($bad_char != false)
+		{
+			$unique_name = substr($unique_name, $bad_char + 1);	
+		}
 
 		$user = get_user_by( $this->settings->field_to_match_to_upn, $unique_name );