Modify little bit CHAP4 and CHAP5