UserInfo spa complete
merge conflicts