R1:7dde01df76ef

Fix issues with first-time account registration

Summary: This worked originally, but the migration broke slightly after the
config was deprecated, and there was another minor issue during setup.