That's what I'm used to. I was wondering if both are right. Thanks for confirming though!
i recommend the latter especially with modern hebrew (Israeli). But ancient hebrew has more laws for letters and nikkudot
Years ago I learned that 'when' can also be כאשר. Is it used much nowadays in everyday Hebrew?