diff --git a/changelog.d/8320.feature b/changelog.d/8320.feature
new file mode 100644
index 0000000000..3afd1dc39e
--- /dev/null
+++ b/changelog.d/8320.feature
@@ -0,0 +1 @@
+Add `uk.half-shot.unstable.login.appservice` login type to allow appservices to login.
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index e8b5fc9a4e..7db7ce3197 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -144,7 +144,7 @@ class LoginRestServlet(RestServlet):
         return 200, result
 
     async def _do_other_login(
-        self, login_submission: JsonDict, appservice: ApplicationService
+        self, login_submission: JsonDict, appservice: Optional[ApplicationService]
     ) -> Dict[str, str]:
         """Handle non-token/saml/jwt logins