Update login scheme in accordance with the Klenin's recommendations