extracted login form for include; updated generic form