Add workaround for chfn failures