What is the version of the following sentence with correct punctuation?

Guests can stay in Charming Geneva apartment when visiting Geneva
Guests can stay in Charming Geneva apartment when visiting Geneva.