Fixed first login problems