Updates to pull 1100

Sorry for the extreme delay on this, but here are some updates to the authentication stuff.