Changed order of new/old passwords