authentication fixes -> server'