Bug Fixes For Email and Car

Fixed a couple of bugs, but they are in the same project as the email
stuff, i think a new one has been created which missed out the email
stuff for some reason so we'll need to transfer it all across.