History of the Water and Spirit Doctrine

[Costeon]

I am not aware of any groups in the history of Christianity before early Oneness believers in the first part of the 20th century who have taught that salvation is a process that involves water baptism and Spirit baptism with the sign tongues, and that until a person has been baptized and spoken in tongues, he has no salvation. All other groups that I'm aware of have taught that salvation occurs at a particular point, either at baptism or at faith alone.

Are you aware of any other groups who have taught the water and Spirit doctrine embraced by the majority of Oneness believers? There is of course debate over whether the apostles and the first believers did, so I'm not asking about whether you think they did. What groups post-New Testament have taught this?