login form re-organized