Issue92 move client auth to update

WIP for review.