I think you are right. I'm an atheist, but I firmly believe that everyone should have the right to worship and keep whatever faith they adhere to  . 
If the state gets involved, you run into all kinds of problems. It took us thousands of years to get this far. Let's take it further and separate church and state completely.