Eliminate one call to authenticated/identity
Tests are working