Login is now working mostly