authenticate until required
Loose comparison to strict comparison and minor documentation issue
Merge branch 'basz-feature/lazy-uid'

Only autheticate when necessary