Fixing broken twitter/fb connect if the user has synced before but deleted the original account.
Merge branch 'master' into circular

* master:
  Fixing broken twitter/fb connect if the user has synced before but deleted the original account.