Move 'me' check outside of author lookup