Adds fields for email verification #19 #18