login time-out -- almost, small bugs