Fix Some Login Issues