authentication changes and servlets inclusion