diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index ac7553de..4f307a2e 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -19,7 +19,9 @@
  */
 class server_add_theme_Core {
   static function head($theme) {
-    return html::script("modules/server_add/js/server_add.js") . "\n";;
+    if (user::active()->admin) {
+      return html::script("modules/server_add/js/server_add.js");
+    }
   }
 
   static function admin_head($theme) {
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 0bfd52e6..8b296987 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -6,7 +6,6 @@
     init_server_add_form();
   });
 </script>
-<!-- ?= html::script("modules/server_add/js/server_add.js"); ? -->
 <div id="gServerAdd">
   <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => p::clean($album_title))) ?></h1>