diff --git a/toolbar.module b/toolbar.module
index c044f9d..73de4be 100755
--- a/toolbar.module
+++ b/toolbar.module
@@ -83,19 +83,20 @@ function toolbar_perm() {
 }
 
 /**
- * Implementation of hook_init().
+ * Implementation of hook_preprocess_page().
  */
-function toolbar_init() {
+function toolbar_preprocess_page(&$variables) {
   global $user;
 
   // Toolbar configured for current user
-  if ( _toolbar_get_user_toolbar($user) ) {
+  if ( _toolbar_get_user_toolbar($user) && !toolbar_suppress(FALSE) ) {
     $path = drupal_get_path('module', 'toolbar');
     drupal_add_js($path . '/toolbar.js');
     drupal_add_css($path . '/toolbar.css');
+    $variables['styles'] = drupal_get_css();
+    $variables['scripts'] = drupal_get_js();
   }
 }
-
 /**
  * Implementation of hook_footer().
  */