Fixed some login issues