diff --git a/rdp/core/type.js b/rdp/core/type.js
index 682c67dc..5da2268e 100644
--- a/rdp/core/type.js
+++ b/rdp/core/type.js
@@ -145,7 +145,7 @@ Type.prototype.read = function(s) {
 		
 		if(oldValue !== this.value) {
 			log.error('constant value mismatch ' + oldValue + ' != ' + this.value);
-			throw new error.ProtocolError("NODE_RDP_CORE_TYPE_CONSTANT_VALUE_MISMATCH");
+            throw new error.ProtocolError("NODE_RDP_CORE_TYPE_CONSTANT_VALUE_MISMATCH", oldValue, this.value);
 		}
 	}
 	else {
diff --git a/webserver.js b/webserver.js
index 9f6bcd0b..d16c95aa 100644
--- a/webserver.js
+++ b/webserver.js
@@ -6028,8 +6028,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
                 });
             }
 
-            // Setup MSTSC.js if needed
-            if (domain.mstsc === true) {
+            // Setup RDP unless indicated as disabled
+            if (domain.mstsc !== false) {
                 obj.app.get(url + 'mstsc.html', function (req, res) { handleMSTSCRequest(req, res, 'mstsc'); });
                 obj.app.ws(url + 'mstscrelay.ashx', function (ws, req) {
                     const domain = getDomain(req);