Fix deactivation

Author: MatMaul

synapse/handlers/identity.py

@@ -251,8 +251,6 @@ async def try_unbind_threepid(self, mxid: str, threepid: dict) -> bool:
         """
         if threepid.get("id_server"):
             id_servers = [threepid["id_server"]]
-        elif self.hs.config.bind_new_user_emails_to_sydent:
-            id_servers = [self.hs.config.bind_new_user_emails_to_sydent]
         else:
             id_servers = await self.store.get_id_servers_user_bound(
                 user_id=mxid, medium=threepid["medium"], address=threepid["address"]
@@ -312,6 +310,9 @@ async def try_unbind_threepid_with_id_server(
         # the server we connect to.
         id_server_url = self.rewrite_id_server_url(id_server, add_https=True)
 
+        if self.hs.config.bind_new_user_emails_to_sydent:
+            id_server_url = self.hs.config.bind_new_user_emails_to_sydent
+
         url = "%s/_matrix/identity/api/v1/3pid/unbind" % (id_server_url,)
 
         try: