Ensure user ID is extracted correctly from call-back URL
Merge branch 'url-scheme'