more changes for GUI side email verification