User Manager changes

Pull changes for UserManager