working on rebased repo: still login problems