Yes you are right. Baptism means baptism with water and also having the priviledge to speak in other tongues. When you are batised, you will have the power for sevice, that means you will have the heart to serve the lord.
Thanks for sharing