Added login/logout
Safe to come back here