reorganised login form