Email Template Fix + First User Minor Improvements