All products and services featured are independently chosen by editors. However, Soaps.com may receive a commission on orders placed through its retail links, and the retailer may receive certain auditable data for accounting purposes.

The good news just keeps on coming! Not only is Javi back on Days of Our Lives, he’s already told Rafe and Gabi that he’s staying in Salem! He let his job know he’s coming back full time, and he’s picking up right where he left off. Well, give or take a relationship or two.

For everyone surprised at this news, we can understand if there’s more than a little confusion about whether he’s staying or leaving.

When we learned that Al Calderon was leaving, the show assured us that Javi was “alive and well in Salem,” before we learned that the role was, indeed, being recast. And then Gwen blew up Leo and Javi’s wedding by bringing Dimitri to town and the once-happy couple split. Leo was left to sort out his feelings with Dimitri and Javi went back to Texas to care for his father after surgery.

And, well, we really haven’t seen him since. At least not until Javi showed up at the end of Friday’s episode! So while it seemed like Calderon’s run had come to an end, Days of Our Lives did assure us that he’d be back in April… but not for good. Because the actor has left the role, and, as we learned back when he first exited, Javi’s recast would begin airing in May.

We just don’t know exactly yet when Calderon’s final date is or when we’ll be meeting our new Javi — or who he is, for that matter!

But with Leo having finally figured out his feelings (and Dimitri letting his horrible, vile, true colors shine through), so long as Javi’s around, there’s hope for these two getting back together. It just might take a little while, since Swoon reports that Javi’s about to find himself a new boyfriend! (Please don’t be Dimitri.)

In Salem, love finds a way. And sooner or later, it looks like Leo and Javi will find their way back to each other.