diff --git a/src/reverseproxy.js b/src/reverseproxy.js
index a5baf06bb..eafa7a7a4 100644
--- a/src/reverseproxy.js
+++ b/src/reverseproxy.js
@@ -617,7 +617,7 @@ async function checkCerts(options, auditSource, progressCallback) {
     assert.strictEqual(typeof progressCallback, 'function');
 
     let locations = [];
-    if (settings.dashboardDomain() !== settings.mailDomain()) locations.push({ domain: settings.mailDomain(), fqdn: settings.mailFqdn(), certificate: null, type: apps.LOCATION_TYPE_MAIL });
+    if (settings.dashboardFqdn() !== settings.mailFqdn()) locations.push({ domain: settings.mailDomain(), fqdn: settings.mailFqdn(), certificate: null, type: apps.LOCATION_TYPE_MAIL });
     locations.push({ domain: settings.dashboardDomain(), fqdn: settings.dashboardFqdn(), certificate: null, type: apps.LOCATION_TYPE_DASHBOARD });
 
     const allApps = (await apps.list()).filter(app => app.runState !== apps.RSTATE_STOPPED);
diff --git a/src/routes/cloudron.js b/src/routes/cloudron.js
index e730c6eb2..8edb8f5b0 100644
--- a/src/routes/cloudron.js
+++ b/src/routes/cloudron.js
@@ -300,7 +300,7 @@ async function prepareDashboardDomain(req, res, next) {
 }
 
 async function renewCerts(req, res, next) {
-    if ('rebuild' in req.body && typeof req.body !== 'boolean') return next(new HttpError(400, 'rebuild must be a boolean'));
+    if ('rebuild' in req.body && typeof req.body.rebuild !== 'boolean') return next(new HttpError(400, 'rebuild must be a boolean'));
 
     const [error, taskId] = await safe(cloudron.renewCerts(req.body, AuditSource.fromRequest(req)));
     if (error) return next(BoxError.toHttpError(error));