Merge "Fix logic for token searching on authorize_create"