fix #160

fix issue #160  and customize error message for password expire