Fixed some login issus