Require either username or email on new registration, fix bug where blank would trigger duplicate error
Merge remote?