Changed forms and login accordingly