test new link options
test new link options
add code for setting validated attribute
fixed typo
fixed issue of regenerating changing email tokens and verification
Some cleanup