diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index ddb0dea329..58b6a84cab 100644
--- a/plugins/Autocomplete/AutocompletePlugin.php
+++ b/plugins/Autocomplete/AutocompletePlugin.php
@@ -39,19 +39,24 @@ class AutocompletePlugin extends Plugin
     }
 
     function onEndShowScripts($action){
-        $js_string = <<<EOT
+        if (common_logged_in()) {
+            $current_user = common_current_user();
+            $js_string = <<<EOT
 <script type="text/javascript">
-var current_user = { screen_name: 'CANDREWS', id: '1' };
+var current_user = { id: '$current_user->id' };
 </script>
 EOT;
-        $action->raw($js_string);
-        $action->script('plugins/Autocomplete/jquery-autocomplete/jquery.autocomplete.pack.js');
-        $action->script('plugins/Autocomplete/Autocomplete.js');
+            $action->raw($js_string);
+            $action->script('plugins/Autocomplete/jquery-autocomplete/jquery.autocomplete.pack.js');
+            $action->script('plugins/Autocomplete/Autocomplete.js');
+        }
     }
 
     function onEndShowLaconicaStyles($action)
     {
-        $action->cssLink('plugins/Autocomplete/jquery-autocomplete/jquery.autocomplete.css');
+        if (common_logged_in()) {
+            $action->cssLink('plugins/Autocomplete/jquery-autocomplete/jquery.autocomplete.css');
+        }
     }
 
 }