Improvements to booking email verification - nearly done!