diff --git a/controllers/CharactergroupsquestsController.inc b/controllers/CharactergroupsquestsController.inc
index 422cb80e..2dbbe50e 100644
--- a/controllers/CharactergroupsquestsController.inc
+++ b/controllers/CharactergroupsquestsController.inc
@@ -103,10 +103,18 @@
                         $station['id'],
                         $charactergroup['id']
                     );
-                    $station['solved'] = $this->Charactergroupsqueststations->hasCharactergroupSolvedStation(
-                        $station['id'],
-                        $charactergroup['id']
-                    );
+                    if($station['entered']) {
+                        $station['tried'] = $this->Charactergroupsqueststations->hasCharactergroupTriedStation(
+                            $station['id'],
+                            $charactergroup['id']
+                        );
+                        if($station['tried']) {
+                            $station['solved'] = $this->Charactergroupsqueststations->hasCharactergroupSolvedStation(
+                                $station['id'],
+                                $charactergroup['id']
+                            );
+                        }
+                    }
                 }
             }
 
diff --git a/controllers/CharactergroupsqueststationsController.inc b/controllers/CharactergroupsqueststationsController.inc
index db71f747..36834008 100644
--- a/controllers/CharactergroupsqueststationsController.inc
+++ b/controllers/CharactergroupsqueststationsController.inc
@@ -194,9 +194,9 @@
             $solved = false;
             $tried = false;
             if(!is_null($charactergroup)) {
-                $solved = $this->Charactergroupsqueststations->hasCharactergroupSolvedStation($station['id'], $charactergroup['id']);
-                if(!$solved) {
-                    $tried = $this->Charactergroupsqueststations->hasCharactergroupTriedStation($station['id'], $charactergroup['id']);
+                $tried = $this->Charactergroupsqueststations->hasCharactergroupTriedStation($station['id'], $charactergroup['id']);
+                if($tried) {
+                    $solved = $this->Charactergroupsqueststations->hasCharactergroupSolvedStation($station['id'], $charactergroup['id']);
                 }
             }
 
diff --git a/views/html/charactergroupsquests/quest.tpl b/views/html/charactergroupsquests/quest.tpl
index be47e89f..f93a89f0 100644
--- a/views/html/charactergroupsquests/quest.tpl
+++ b/views/html/charactergroupsquests/quest.tpl
@@ -88,9 +88,17 @@
                 <?=_('Station not yet discovered')?>
                 <?php endif ?>
             </span>
-            <?php if(array_key_exists('solved', $station) && $station['solved']) : ?>
+            <?php if(array_key_exists('entered', $station) && $station['entered']) : ?>
             <span class="xp">
+                <?php if($station['tried']) : ?>
+                <?php if($station['solved']) : ?>
                 <i class="fa fa-check-circle fa-fw"></i>
+                <?php else : ?>
+                <i class="fa fa-times-circle fa-fw"></i>
+                <?php endif ?>
+                <?php else : ?>
+                <i class="fa fa-globe fa-fw"></i>
+                <?php endif ?>
             </span>
             <?php endif ?>
         </li>
@@ -100,10 +108,18 @@
     <ol class="grpqslist">
         <?php foreach($stations as &$station) : ?>
         <li>
-            <?php if(!array_key_exists('entered', $station) || $station['entered']) : ?>
+            <?php if(array_key_exists('entered', $station) && $station['entered']) : ?>
             <a href="<?=$linker->link(array('charactergroupsqueststations','station',$seminary['url'],$groupsgroup['url'],$quest['url'],$station['url']))?>">
+                <?php if($station['tried']) : ?>
+                <?php if($station['solved']) : ?>
                 <?php if(!is_null($station['stationpicture_id'])) : ?>
-                    <img title="<?=$station['title']?>" src="<?=$linker->link(array('media','charactergroupsqueststation',$seminary['url'],$groupsgroup['url'],$quest['url'],$station['url']))?>" />
+                <img title="<?=$station['title']?>" src="<?=$linker->link(array('media','charactergroupsqueststation',$seminary['url'],$groupsgroup['url'],$quest['url'],$station['url']))?>" />
+                <?php else : ?>
+                <i class="fa fa-circle"></i>
+                <?php endif ?>
+                <?php else : ?>
+                <i class="fa fa-times-circle"></i>
+                <?php endif ?>
                 <?php else : ?>
                 <i class="fa fa-globe"></i>
                 <?php endif ?>
diff --git a/views/html/charactergroupsqueststations/station.tpl b/views/html/charactergroupsqueststations/station.tpl
index fe93542c..4444c6a0 100644
--- a/views/html/charactergroupsqueststations/station.tpl
+++ b/views/html/charactergroupsqueststations/station.tpl
@@ -27,9 +27,14 @@
         </a>
     </li>
     <?php endif ?>
-    <?php if($solved !== false) : ?>
+    <?php if($tried) : ?>
     <li>
+        <?php if($solved) : ?>
         <i class="fa fa-check-circle fa-fw"></i>
+        <?php else : ?>
+        <i class="fa fa-times-circle fa-fw"></i>
+        <?php endif ?>
+    </li>
     <?php endif ?>
 </ul>