Fixed settings and login