fix issue when there is no login