Fixed email and flashes