more changes on edit user and logout user