Authn changes

Fixes #260 
ENTITY