Fixed it so settings are saved if a license is valid even without hitting the 'save changes' button
Merge remote-tracking branch 'origin/licensing' into licensing