Merged the UserManager again...