Small OAuth fixes

Fixes #2076. Also fixes connecting an OpenStreetMap account with the dev app (it's not broken in production).