Finish user signup
Finish user signup Mark II