#99: update for client side security.