Added UserId and phone listener changes