Is this change something to do with fetching user by name? I guess no. Right?