Fixed Login issues