Fix for the list reset and added credentials security.