Finish user signup
Tasks for 7 part and add fix