(bug 4062) Add authentication bits

Revert "(bug4062) Remove auth bits ( to move into another branch )"

This reverts commit 8e497c9577d65eeb22a9ea31c8c7ef7e890cc7d3.