Added XKPasswd under 936