Hi,
I had this problem too and solved it by creating a duplicate popup. The first (Display popup once per user = true) is set to fire once per user, the second (Display popup once per user = false) is set to fire from the button. It works for me.
Best regards.