Added logic for enter name field as well