diff --git a/src/components/tools/MeasurementTools/script.js b/src/components/tools/MeasurementTools/script.js
index bd553040..59e7de5c 100644
--- a/src/components/tools/MeasurementTools/script.js
+++ b/src/components/tools/MeasurementTools/script.js
@@ -48,7 +48,7 @@ export default {
     SvgIcon,
     SourceSelect,
   },
-  inject: ['$notify'],
+  inject: ['$notify', 'girderRest'],
   data() {
     return {
       uiToolList: ToolList,
diff --git a/src/components/tools/MeasurementTools/template.html b/src/components/tools/MeasurementTools/template.html
index e000f0b7..1cba348a 100644
--- a/src/components/tools/MeasurementTools/template.html
+++ b/src/components/tools/MeasurementTools/template.html
@@ -169,9 +169,10 @@
         <template v-else>
           <div class="pt-2 body-1 teal--text text-center">No measurements yet</div>
         </template>
-        <v-btn :disabled="!targetProxy" @click="upload">
+        <v-btn :disabled="!targetProxy || !girderRest.user" @click="upload">
           Upload
         </v-btn>
+        <span v-show="!girderRest.user" class="body-2">Log in to upload</span>
       </div>
     </v-card>
   </v-container>
diff --git a/src/components/tools/PaintTool/script.js b/src/components/tools/PaintTool/script.js
index f6b4b835..6bcab3a8 100644
--- a/src/components/tools/PaintTool/script.js
+++ b/src/components/tools/PaintTool/script.js
@@ -53,6 +53,7 @@ function createLabelMapFromImage(imageData) {
 
 export default {
   name: 'PaintTool',
+  inject: ['girderRest'],
   components: {
     PalettePicker,
     PopUp,
diff --git a/src/components/tools/PaintTool/template.html b/src/components/tools/PaintTool/template.html
index a4bd69ab..b4a7480e 100644
--- a/src/components/tools/PaintTool/template.html
+++ b/src/components/tools/PaintTool/template.html
@@ -213,13 +213,13 @@
           </v-radio-group>
         </v-list>
       </v-flex>
-      <v-flex xs2>
-        <v-btn
-          @click="upload()"
-        >
-          Upload
-        </v-btn>
-      </v-flex>
+      <v-btn
+        :disabled="!girderRest.user"
+        @click="upload()"
+      >
+        Upload
+      </v-btn>
+      <span v-show="!girderRest.user" class="body-2">Log in to upload</span>
     </v-layout>
   </v-container>
 </div>