Improve consent to registration flow

[remomueller]

Currently consenting before registering requires you to click through the consent again, should polish up this particular flow.

Issue #1012 should also be done as well.