Fix some email bugs
Finish the signup form