Исправления

This is a sentence from a friend of mine and I wanted to know if it is wrong or not: You make me smile when I do not even want to smile/laugh My version: You made me smile even if I do/did not want to What would you use? :)