Merge pull request #1314 from Arantor/release-2.1

! Add the ability to show the registration agreement all the time, as li...
Merge pull request #1315 from Arantor/release-2.1

More fixes