changed form to reflect auto fix of @ and # for new event