Fix error in passing the user type up the chain