signup bug fix
merge