Update Login Form
Fix conflicts Login