I agree, I was just fixing the issue of test email not being delivered and did not think of fixing the things that far ahead ;)