Index: /mods/wpsg_mod_creditcard.class.php
===================================================================
--- /mods/wpsg_mod_creditcard.class.php	(revision 6876)
+++ /mods/wpsg_mod_creditcard.class.php	(revision 6877)
@@ -220,6 +220,7 @@
 
 			if ( 
-					($state > 1) ||
-					($state >= 1 && $this->shop->hasMod('wpsg_mod_onepagecheckout'))
+					(($state > 1) ||
+					($state >= 1 && $this->shop->hasMod('wpsg_mod_onepagecheckout'))) &&
+					(isset($_REQUEST['wpsg_checkout']) || isset($_REQUEST['wpsg_checkout2']))
 				)
 			{