Light Bootstrapping

Some light bootstrapping in addition to the first part of user
authentication
Revert "Light Bootstrapping"

This reverts commit fce64fccd9599bf6832b68b8b534997bce0919d2.
Light Bootstrapping

Some light Bootstrapping in additional to the first part of user
authentication