Feature email input

@JBlaak 
Merge conflict!