diff --git a/htdocs/templates2/ocstyle/articles/DE/changelog.tpl b/htdocs/templates2/ocstyle/articles/DE/changelog.tpl
index 9589a2aa..499014fb 100644
--- a/htdocs/templates2/ocstyle/articles/DE/changelog.tpl
+++ b/htdocs/templates2/ocstyle/articles/DE/changelog.tpl
@@ -32,6 +32,7 @@
 		 <li class="changelogitem">spanische und italienische Übersetzung vervollständigt</li>
 		 <li class="changelogitem">inaktive Caches auch auf der <a href="./newcachesrest.php">Alle-außer-Deutschland-Seite</a> ausgeblendet</li>
 		 <li class="changelogitem">einheitliche Schreibweise für Attributnamen</li>
+		 <li class="changelogitem">Cachelisting: &bdquo;Decrypt&ldquo; &rarr; &bdquo;Entschlüsseln&ldquo;</li>
    </ul>
 	 <p>Korrigiert (Bugfixes):</p>
 	 <ul class="changelog">
@@ -44,6 +45,7 @@
 	   <li class="changelogitem"><a href="doc/xml/">Das XML-Interface</a> schneidet im Standardzeichensatz keine Daten mehr bei unbekannten Zeichen ab.</li>
 	   <li class="changelogitem">Fehlermeldung bei ungültigem Logdatum korrigiert</li>
 	   <li class="changelogitem">Schreibweisenabhängigkeit von Logpasswörtern korrigiert (Groß-/Kleinschreibung ist nun immer egal)</li>
+	   <li class="changelogitem">Hinweis-Entschlüsselung bei abgeschaltetem JavaScript</li>
    </ul>
 	<br />
 
diff --git a/htdocs/templates2/ocstyle/articles/EN/changelog.tpl b/htdocs/templates2/ocstyle/articles/EN/changelog.tpl
index 8837961a..495cacbf 100644
--- a/htdocs/templates2/ocstyle/articles/EN/changelog.tpl
+++ b/htdocs/templates2/ocstyle/articles/EN/changelog.tpl
@@ -43,6 +43,7 @@
 	   <li class="changelogitem"><a href="doc/xml/">XML-Interface</a> will not truncate default charset data at unknown characters.</li>
 	   <li class="changelogitem">fixed error message for invalid log date</li>
 	   <li class="changelogitem">fixed case insensitivity of log passwords</li>
+	   <li class="changelogitem">decrypting hints when JavaScript is disabled</li>
    </ul>
 	<br />
 
diff --git a/htdocs/templates2/ocstyle/viewcache.tpl b/htdocs/templates2/ocstyle/viewcache.tpl
index da2a37ec..f245c0a7 100644
--- a/htdocs/templates2/ocstyle/viewcache.tpl
+++ b/htdocs/templates2/ocstyle/viewcache.tpl
@@ -323,25 +323,23 @@
 		{t}Additional waypoints can make searching easier, for example by pointing to a suitable parkering or start of a path. The waypoints are downloaded in the GPX-file.{/t}
 	</div>
 {/if}
-
+}
 <!-- Hints -->
 {if $cache.hint!=''}
 	<div class="content2-container bg-blue02">
   	<p class="content-title-noshade-size2">
   		<img src="resource2/{$opt.template.style}/images/description/22x22-encrypted.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="{t}Additional hint{/t}" /> {t}Additional hint{/t}&nbsp;&nbsp;
-  		<span id="decrypt-info">
+  		<span id="decrypt-info">{if $crypt}
 				<img src="resource2/{$opt.template.style}/images/viewcache/decrypt.png" class="icon32" width="22" height="22" alt="" />
-				{literal}
-					<span style="font-weight: 400;"><a href="viewcache.php?wp={$cache.wpoc|urlencode}&nocrypt=1&desclang={$cache.desclanguage|urlencode}#decrypt-info" onclick="var ch = document.getElementById('decrypt-hints').childNodes;for(var i=0;i < ch.length;++i) {var e = ch[i]; decrypt(e);} document.getElementById('decrypt-info').style.display = 'none';
-					bNoCrypt = 1;
-					return false;">Decrypt</a></span>
-				{/literal}
+				<span style="font-weight: 400;"><a href="viewcache.php?wp={$cache.wpoc}&nocrypt=1&desclang={$cache.desclanguage|urlencode}#decrypt-info" {literal}onclick="var ch = document.getElementById('decrypt-hints').childNodes;for(var i=0;i < ch.length;++i) {var e = ch[i]; decrypt(e);} document.getElementById('decrypt-info').style.display = 'none';
+				bNoCrypt = 1;
+				return false;"{/literal}>{t}Decrypt{/t}</a>{/if}</span>
 			</span>
 		</p>
 	</div>
 
 	<div class="content2-container">
-		<p id="decrypt-hints">{$cache.hint|rot13html}</p>
+		<p id="decrypt-hints">{if $crypt}{$cache.hint|rot13html}{else}{$cache.hint}{/if}</p>
 		<div style="width: 200px; float: right;">
 			<font style="font-family: 'Courier New',FreeMono,Monospace;" face="Courier" size="2">A|B|C|D|E|F|G|H|I|J|K|L|M</font>
 			<font style="font-family: 'Courier New',FreeMono,Monospace;" face="Courier" size="2">N|O|P|Q|R|S|T|U|V|W|X|Y|Z</font>
diff --git a/htdocs/viewcache.php b/htdocs/viewcache.php
index 246a3b7d..6168f548 100644
--- a/htdocs/viewcache.php
+++ b/htdocs/viewcache.php
@@ -62,7 +62,7 @@ function getChildWaypoints($cacheid)
 		exit;
 	}
 
-	$bCrypt = isset($_REQUEST['nocrypt']) ? ($_REQUEST['nocrypt']!=1) : true;
+	$bCrypt = !isset($_REQUEST['nocrypt']) || ($_REQUEST['nocrypt'] != 1);
 	$tpl->assign('crypt', $bCrypt);
 
 	if (isset($_REQUEST['desclang']))