Moved to run under Tomcat. Removed Email validation during the process - must re-enable