Fix bug that would prompt for unnecessary password