Fixed extractUserName