Merge pull request #6024 from matrix-org/dbkr/fix_sso_fallback_login

Fix SSO fallback login

2 files changed, 2 insertions, 1 deletions

diff --git a/changelog.d/6024.bugfix b/changelog.d/6024.bugfix
new file mode 100644

index 0000000000..ddad34595b
--- /dev/null
+++ b/changelog.d/6024.bugfix
@@ -0,0 +1 @@
+Fix bug where login error was shown incorrectly on SSO fallback login.
diff --git a/synapse/static/client/login/js/login.js b/synapse/static/client/login/js/login.js

index e02663f50e..276c271bbe 100644
--- a/synapse/static/client/login/js/login.js
+++ b/synapse/static/client/login/js/login.js
@@ -62,7 +62,7 @@ var show_login = function() {
         $("#sso_flow").show();
     }
 
-    if (!matrixLogin.serverAcceptsPassword && !matrixLogin.serverAcceptsCas) {
+    if (!matrixLogin.serverAcceptsPassword && !matrixLogin.serverAcceptsCas && !matrixLogin.serverAcceptsSso) {
         $("#no_login_types").show();
     }
 };