Small changes to UserManager and user.xhtml.