Change codebase to query or create correct User model