diff --git a/ChangeLog b/ChangeLog
index 15cc1dfa8..85ff7367f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2020-03-09 Franz Holzinger <franz@ttproducts.de>
+    * bugfix: ###FE_GROUP_0_TEMPLATE### if no frontend user has logged in must check for the group=-1 and not for 0. Every logged in frontend user is member of group 0 now!
+    * bugfix: markers must be uppercase. ###FE_CONDITION1_FALSE_TEMPLATE###
 
 2020-03-07 Franz Holzinger <franz@ttproducts.de>
     * bugfix: resolve issues where the count function might be applied on a variable which is not an array 
diff --git a/template/products_css_variants_de.html b/template/products_css_variants_de.html
index 5d77a5414..9c4dd9e5e 100755
--- a/template/products_css_variants_de.html
+++ b/template/products_css_variants_de.html
@@ -44,7 +44,9 @@ <h3>ITEM_LIST_TEMPLATE</h3>
 
 	This subpart is used to display the regular list of products. It's also used by search-results.-->
 
-
+        <!-- ###FE_GROUP_0_TEMPLATE### begin -->
+        Sie sind nicht angemeldet!
+        <!-- ###FE_GROUP_0_TEMPLATE### end -->
 	  <!-- ###FE_GROUP_1_TEMPLATE### begin -->
 		Sie sind angemeldet!
 	<!-- ###FE_GROUP_1_TEMPLATE### end -->
@@ -267,9 +269,6 @@ <h3>ITEM_LIST_RELATED_TEMPLATE</h3>
 
 <h3>&auml;hnliche Produkte</h3>
 
-<!-- ###FE_GROUP_1_TEMPLATE### begin -->
-Sie sind eingeloggt!
-<!-- ###FE_GROUP_1_TEMPLATE### end -->
 <!--###LINK_PREV###-->###GW2B###<div align="left"><b>vorherige Seite</b>###GW2E###</div><!--###LINK_PREV###-->
 <!-- ###LINK_BROWSE### begin -->
 [ ###BROWSE_LINKS### ]
diff --git a/view/class.tx_ttproducts_orderaddress_view.php b/view/class.tx_ttproducts_orderaddress_view.php
index 05d280267..a4cd6a58c 100755
--- a/view/class.tx_ttproducts_orderaddress_view.php
+++ b/view/class.tx_ttproducts_orderaddress_view.php
@@ -67,7 +67,11 @@ public function getWrappedSubpartArray(
 					$groupNumber = substr($tagPart1, 0, $offset);
 
 					if (tx_div2007_core::testInt($groupNumber)) {
-						if (GeneralUtility::inList($GLOBALS['TSFE']->gr_list, $groupNumber)) {
+                        $comparatorNumber = $groupNumber;
+                        if (!$comparatorNumber) {
+                            $comparatorNumber = -1; // Also a logged in Front End User has group 0! 
+                        }
+						if (GeneralUtility::inList($GLOBALS['TSFE']->gr_list, $comparatorNumber)) {
 							$wrappedSubpartArray['###FE_GROUP_' . $groupNumber . '_TEMPLATE###'] = array('', '');
 						} else {
 							$subpartArray['###FE_GROUP_' . $groupNumber . '_TEMPLATE###'] = '';
@@ -99,15 +103,15 @@ public function getWrappedSubpartArray(
 		}
 
 		if (
-			isset($viewTagArray['FE_CONDITION1_true_TEMPLATE']) ||
-			isset($viewTagArray['FE_CONDITION1_false_TEMPLATE'])
+			isset($viewTagArray['FE_CONDITION1_TRUE_TEMPLATE']) ||
+			isset($viewTagArray['FE_CONDITION1_FALSE_TEMPLATE'])
 		) {
 			if ($this->getModelObj()->getCondition() || !$this->getModelObj()->getConditionRecord()) {
-				$wrappedSubpartArray['###FE_CONDITION1_true_TEMPLATE###'] = array('', '');
-				$subpartArray['###FE_CONDITION1_false_TEMPLATE###'] = '';
+				$wrappedSubpartArray['###FE_CONDITION1_TRUE_TEMPLATE###'] = array('', '');
+				$subpartArray['###FE_CONDITION1_FALSE_TEMPLATE###'] = '';
 			} else {
-				$wrappedSubpartArray['###FE_CONDITION1_false_TEMPLATE###'] = array('', '');
-				$subpartArray['###FE_CONDITION1_true_TEMPLATE###'] = '';
+				$wrappedSubpartArray['###FE_CONDITION1_FALSE_TEMPLATE###'] = array('', '');
+				$subpartArray['###FE_CONDITION1_TRUE_TEMPLATE###'] = '';
 			}
 		}
 	}