Added proper switches to support name and email address.