Cristian: auth fixes