Slight change to token request handling in GroupThread