diff --git a/www/common/sframe-common-interface.js b/www/common/sframe-common-interface.js
index 52d95b040..97fcc9fb6 100644
--- a/www/common/sframe-common-interface.js
+++ b/www/common/sframe-common-interface.js
@@ -98,6 +98,7 @@ define([
                 break;
             case 'template':
                 if (!AppConfig.enableTemplates) { return; }
+                if (!common.isLoggedIn()) { return; }
                 button = $('<button>', {
                     title: Messages.saveTemplateButton,
                 }).append($('<span>', {'class':'fa fa-bookmark', style: 'font:'+size+' FontAwesome'}));
diff --git a/www/filepicker/inner.js b/www/filepicker/inner.js
index 62b798f8d..29b6e4f3f 100644
--- a/www/filepicker/inner.js
+++ b/www/filepicker/inner.js
@@ -109,7 +109,7 @@ define([
             });
 
             //If file, display the upload button
-            if (types.indexOf('file') !== -1) {
+            if (types.indexOf('file') !== -1 && common.isLoggedIn()) {
                 $filter.append(common.createButton('upload', false, data));
             }