Squash validation bugs and tidy up
Only open conversation thread when an email is passed