Password recovery

Please add 5 and 3.