Index: trunk/kernel/units/users/users_tag_processor.php
===================================================================
diff -u -r1929 -r1996
--- trunk/kernel/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 1929)
+++ trunk/kernel/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 1996)
@@ -21,7 +21,7 @@
 		
 		function SuggestRegister($params)
 		{
-			return !( $this->Application->LoggedIn() || $this->Application->ConfigValue('Comm_RequireLoginBeforeCheckout') );
+			return !$this->Application->LoggedIn() && !$this->Application->ConfigValue('Comm_RequireLoginBeforeCheckout') && $this->RegistrationEnabled($params);
 		}
 		
 		function ConfirmPasswordLink($params)
Index: trunk/core/units/users/users_tag_processor.php
===================================================================
diff -u -r1929 -r1996
--- trunk/core/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 1929)
+++ trunk/core/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 1996)
@@ -21,7 +21,7 @@
 		
 		function SuggestRegister($params)
 		{
-			return !( $this->Application->LoggedIn() || $this->Application->ConfigValue('Comm_RequireLoginBeforeCheckout') );
+			return !$this->Application->LoggedIn() && !$this->Application->ConfigValue('Comm_RequireLoginBeforeCheckout') && $this->RegistrationEnabled($params);
 		}
 		
 		function ConfirmPasswordLink($params)