fixes for signup bugs
rolled back rescue change