Limit author conditions better

https://www.pivotaltracker.com/story/show/74921390