diff --git a/handlers/Saml2.cfc b/handlers/Saml2.cfc
index 3dee499..f6d6e00 100644
--- a/handlers/Saml2.cfc
+++ b/handlers/Saml2.cfc
@@ -173,8 +173,8 @@ component {
 		return {
 			  email       = ( userDetails.email_address ?: "" )
 			, displayName = ( userDetails.display_name ?: "" )
-			, firstName   = ListFirst( userDetails.display_name ?: "", " " )
-			, lastName    = ListRest( userDetails.display_name ?: "", " " )
+			, firstName   = userDetails.firstname ?: ( ListFirst( userDetails.display_name ?: "", " " ) )
+			, lastName    = userDetails.lastname ?: ( ListRest( userDetails.display_name ?: "", " " ) )
 			, id          = userDetails.id ?: getLoggedInUserId()
 		};
 	}