Index: /lib/filter_functions.inc.php
===================================================================
--- /lib/filter_functions.inc.php	(revision 5652)
+++ /lib/filter_functions.inc.php	(revision 5654)
@@ -302,9 +302,24 @@
 		global $wp_admin_bar, $wpdb;
 		
-		if (!is_super_admin() || !is_admin_bar_showing()) return;
+		if (!is_super_admin() || !is_admin_bar_showing())  { return;
 		
 		$wp_admin_bar->add_menu(array('id' => 'wpsg', 'title' => __('wpShopGermany Debug', 'wpsg'), 'href' => home_url().'?wpsg_debug=1')); 
 		
-		
+		} else { 
+				
+		// add wpShopGermany to the WP Toolbar
+		$args = array(
+			'id' => 'wpshopgermany',
+			'title' => 'wpShopGermany',
+			'href' => "/wp-admin/admin.php?page=wpsg-Admin",
+			'meta' => array(
+				'class' => 'wpsg_adminbar_link',
+				'title' => 'wpShopGermany'
+			)
+		);
+		
+		$wp_admin_bar->add_node($args);
+			
+		}
 	}
 	
Index: /wpshopgermany.php
===================================================================
--- /wpshopgermany.php	(revision 5652)
+++ /wpshopgermany.php	(revision 5654)
@@ -172,4 +172,5 @@
 	add_filter('upgrader_pre_install', 'wpsg_pre_install', 10, 2);
 	add_filter('upgrader_post_install', 'wpsg_post_install', 10, 2);
+	add_action('admin_bar_menu', 'wpsg_admin_bar_menu', 2000);
 	
 	if (is_admin())
@@ -204,7 +205,5 @@
 		add_action('wp_footer', array($GLOBALS['wpsg_sc'], 'wp_foot'));
 		add_action('template_redirect', array($GLOBALS['wpsg_sc'], 'template_redirect'));
-		
-		if ($GLOBALS['wpsg_sc']->get_option('wpsg_debugModus') == '1') add_action('admin_bar_menu', 'wpsg_admin_bar_menu', 2000);
-								
+			
 		if ($GLOBALS['wpsg_sc']->get_option('wpsg_removeWpTrimExcerpt') == '1') remove_filter('get_the_excerpt', 'wp_trim_excerpt');
 		if ($GLOBALS['wpsg_sc']->get_option('wpsg_removeWpAutoOp') == '1') remove_filter('the_content', 'wpautop');
@@ -217,17 +216,3 @@
 	$GLOBALS['wpsg_sc']->callMods('load', array());
 	
-	// add wpShopGermany to the WP Toolbar
-	function custom_toolbar_link($wp_admin_bar) {
-		$args = array(
-				'id' => 'wpshopgermany',
-				'title' => 'wpShopGermany',
-				'href' => "/wp-admin/admin.php?page=wpsg-Admin",
-				'meta' => array(
-						'class' => 'wpsg_adminbar_link',
-						'title' => 'wpsg adminbar link'
-				)
-		);
-		$wp_admin_bar->add_node($args);
-	}
-	add_action('admin_bar_menu', 'custom_toolbar_link', 999);
 ?>