Added support for forms and login/ logout