Adding support for when user is null