diff --git a/src/app-openid.js b/src/app-openid.js
index 931484074..487c268b8 100644
--- a/src/app-openid.js
+++ b/src/app-openid.js
@@ -49,7 +49,7 @@ app.post('/disable', validateSessionMiddleware, async (req, res) => {
   let { error } = (await disableOpenID(req.body)) || {};
 
   if (error) {
-    res.status(500).send({ status: 'error', reason: error });
+    res.status(401).send({ status: 'error', reason: error });
     return;
   }
   res.send({ status: 'ok' });
diff --git a/upcoming-release-notes/526.md b/upcoming-release-notes/526.md
new file mode 100644
index 000000000..7870ad79a
--- /dev/null
+++ b/upcoming-release-notes/526.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [lelemm]
+---
+
+Better invalid password message when disabling openid