added logout and changepwd
fixed conflict