Yet another rollback fix
Make emailSecret not null