fix token generation for emailconfirmation
Merge remote-tracking branch 'origin/master'