Login all fixed for WSU and NONWSU