diff --git a/src/addons.js b/src/addons.js
index e1d9f318f..b356d430e 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -248,6 +248,7 @@ function setupOauth(app, options, callback) {
 
     debugApp(app, 'setupOauth: id:%s clientSecret:%s', id, clientSecret);
 
+    // ensure 'addon-oauth-' is in sync with oauth.js
     clientdb.delByAppId('addon-oauth-' + appId, function (error) { // remove existing creds
         if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
@@ -292,6 +293,7 @@ function setupSimpleAuth(app, options, callback) {
 
     debugApp(app, 'setupSimpleAuth: id:%s', id);
 
+    // ensure 'addon-simpleauth-' is in sync with oauth.js
     clientdb.delByAppId('addon-simpleauth-' + appId, function (error) { // remove existing creds
         if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
diff --git a/src/routes/oauth2.js b/src/routes/oauth2.js
index 200894090..b81a6a6bf 100644
--- a/src/routes/oauth2.js
+++ b/src/routes/oauth2.js
@@ -220,8 +220,10 @@ function loginForm(req, res) {
                 return render(constants.TEST_NAME, '/api/v1/cloudron/avatar');
             } else if (appId.indexOf('external-') === 0) {
                 return render('External Application', '/api/v1/cloudron/avatar');
-            } else if (appId.indexOf('addon-') === 0) {
-                appId = appId.slice('addon-'.length);
+            } else if (appId.indexOf('addon-oauth') === 0) {
+                appId = appId.slice('addon-oauth'.length);
+            } else if (appId.indexOf('addon-simpleauth') === 0) {
+                appId = appId.slice('addon-simpleauth'.length);
             } else if (appId.indexOf('proxy-') === 0) {
                 appId = appId.slice('proxy-'.length);
             }