Work for logged out viewers too.
Merge pull request #419 from anall/release-1.16

Work for logged out viewers too.