Update user model to use new functionality. Fixes #2270. Fixes #2271.