On the Day of Pentecost, the Apostle Peter preached the first gospel sermon for the New Testament Church..  When Peter preached that annointed message, the Holy Ghost pricked the hearts of sinners with conviction, and they cried out, "Men and brethren, what shall we  do?" (Acts 2:37).  In response to their question, Peter, with the endorsement of the other apostles, answered:  "Repent, and be baptized every one of you in the name of Jesus Christ for the remission of sins, and ye shall receive the gift of the Holy Ghost.  " (Acts 2:38)  Jesus had given to the Apostle Peter the "keys of the kingdom" (Matthew 16:19). Our salvation must be "built Upon the foundation of the apostles and prophets, Jesus Christ himself being the chief corner stone" (Ephesians 2:20). 

The new birth consists of both water and Spirit, and it was never presented as optional.  "Ye must be born again" are the words of Jesus in John 3:7.  Until a person is born of the Spirit, he is not truly a son of God under the new covenant.

The Holy Ghost gives the power to become sons of God and members of the family of God.

 "Now if any man have not the Spirit of Christ, he is none of his" (Romans 8:9).

The Holy Ghost baptizes us into the body of Christ. "By one Spirit are we all baptized unto one body, whether we be Jews or Gentiles, whether we be bond or free,- and have been all made to drink into one Spirit" (I Corinthians 12:13) The gospel is the death, burial and resurrection of Jesus Christ

(I Corinthians 15:14).  In order to obey the gospel fullly, we must die to sin through repentance, be buried with Christ in water baptism and then rise to walk in .,.newness of life" (Romans 6:4) by being filled with the same Spirit that raised Jesus from the dead (Romans 8:1 1).  This is the New Birth experience of New Testament salvation.

I think there both right, when you get saved your born again Spirituly. Then when Christ comes and get's us then our new Spirit gose to our Born again new Bodies..