Hi @Anton L Yes, that is the behaviour I get - both the [Pay and Join] and the [Attend Course] buttons are visible.

I will do some further testing to see if disabling the second one completely will provide a good workaround and post here further info

Many thanks, guys, much appreciated.