3 files changed, 4 insertions, 3 deletions

diff --git a/index.php b/index.php
index 19d54db8..576a93de 100644
--- a/index.php
+++ b/index.php
@@ -1159,6 +1159,7 @@ function renderPage($conf, $pluginManager)
             $PAGE->assign('timezone_form', $timezone_form);
             $PAGE->assign('timezone_js',$timezone_js);
             $PAGE->assign('private_links_default', $conf->get('privacy.default_private_links', false));
+            $PAGE->assign('session_protection_disabled', $conf->get('security.session_protection_disabled', false));
             $PAGE->assign('enable_rss_permalinks', $conf->get('feed.rss_permalinks', false));
             $PAGE->assign('enable_update_check', $conf->get('updates.check_updates', true));
             $PAGE->assign('hide_public_links', $conf->get('privacy.hide_public_links', false));
diff --git a/tests/Url/UrlTest.php b/tests/Url/UrlTest.php
index 4bf53b2d..05862372 100644
--- a/tests/Url/UrlTest.php
+++ b/tests/Url/UrlTest.php
@@ -184,9 +184,9 @@ class UrlTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test IndToAscii.
+     * Test International Domain Name to ASCII conversion
      */
-    function testIndToAscii()
+    function testIdnToAscii()
     {
         $ind = 'http://www.académie-française.fr/';
         $expected = 'http://www.xn--acadmie-franaise-npb1a.fr/';
diff --git a/tpl/configure.html b/tpl/configure.html
index ad9a2085..983bcd08 100644
--- a/tpl/configure.html
+++ b/tpl/configure.html
@@ -36,7 +36,7 @@
         <td><b>Security:</b></td>
         <td>
           <input type="checkbox" name="disablesessionprotection" id="disablesessionprotection"
-                   {if="$private_links_default"}checked{/if}>
+                   {if="$session_protection_disabled"}checked{/if}>
           <label
             for="disablesessionprotection">&nbsp;Disable session cookie hijacking protection (Check this if you get
             disconnected often or if your IP address changes often.)</label>