diff --git a/docs/TODO b/docs/TODO
index 3a5ca53..83be322 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,8 +1,5 @@
 Short Term:
 
-- Proper Javascript namespacing for Canvas and RFB (using function for
-    true local variables and functions).
-
 - Timing delta between frames in proxy record log, for playback
   support (for demo and test).
 
diff --git a/include/default_controls.js b/include/default_controls.js
index 3be50ed..8a05ad6 100644
--- a/include/default_controls.js
+++ b/include/default_controls.js
@@ -44,7 +44,7 @@ load: function(target) {
     html += '          onmouseout="DefaultControls.canvasFocus();">';
     html += '          <ul>';
     html += '            <li><input id="VNC_encrypt"';
-    html += '                type="checkbox" checked> Encrypt</li>';
+    html += '                type="checkbox"> Encrypt</li>';
     html += '            <li><input id="VNC_base64"';
     html += '                type="checkbox" checked> Base64 Encode</li>';
     html += '            <li><input id="VNC_true_color"';
@@ -112,7 +112,7 @@ load: function(target) {
     DC.initSetting('host', '');
     DC.initSetting('port', '');
     DC.initSetting('password', '');
-    DC.initSetting('encrypt', true);
+    DC.initSetting('encrypt', false);
     DC.initSetting('base64', true);
     DC.initSetting('true_color', true);
     DC.initSetting('cursor', true);