Fixed Login/Form Handling