Singup and Signin with no role assigned
Merge conflicts fixing