Added proper validation in addressbook