login + loginForm improvements