More work on the user management stuff.