Fixes #6188 - Dynflowized activation key creation
Merge pull request #4340 from adamruzicka/fixes-6188

Fixes #6188 - Dynflowized activation key creation