intermediate, move aftersignup code
more changes for moving aftersignup code