Improved email confirmation - directive