Switches to randomly-generated salt, moves keys