Fix #2078 Activation URL always connects with HTTP
Merge pull request #2092 from dennishendriksen/master

Fix #2078 Activation URL always connects with HTTP