re-fix critical bug on signup

(sorry bad solving of one conflict)