diff --git a/bigbluebutton-html5/imports/api/presentation-upload-token/server/publishers.js b/bigbluebutton-html5/imports/api/presentation-upload-token/server/publishers.js
index 6188936351aece0839f5fedaa360db9ed48373b8..ffd1d5f49626db48b753ee6e4a0cf093c83cd845 100644
--- a/bigbluebutton-html5/imports/api/presentation-upload-token/server/publishers.js
+++ b/bigbluebutton-html5/imports/api/presentation-upload-token/server/publishers.js
@@ -4,12 +4,10 @@ import PresentationUploadToken from '/imports/api/presentation-upload-token';
 import Logger from '/imports/startup/server/logger';
 import { extractCredentials } from '/imports/api/common/server/helpers';
 
-Meteor.publish('presentation-upload-token', (podId, filename) => {
+function presentationUploadToken(podId, filename) {
   if (!this.userId) {
     return PresentationUploadToken.find({ meetingId: '' });
   }
-
-  // TODO--we need to resubscribe when we have this.userId
   const { meetingId, requesterUserId } = extractCredentials(this.userId);
   check(podId, String);
   check(filename, String);
@@ -24,4 +22,11 @@ Meteor.publish('presentation-upload-token', (podId, filename) => {
   Logger.debug(`Publishing PresentationUploadToken for ${meetingId} ${requesterUserId}`);
 
   return PresentationUploadToken.find(selector);
-});
+}
+
+function publish(...args) {
+  const boundPresentationUploadToken = presentationUploadToken.bind(this);
+  return boundPresentationUploadToken(...args);
+}
+
+Meteor.publish('presentation-upload-token', publish);
diff --git a/bigbluebutton-html5/imports/ui/services/auth/index.js b/bigbluebutton-html5/imports/ui/services/auth/index.js
index ae5329e150e88a8b4103c953eb409530a62e073e..e6e80b1d66f3059a72b37e89e899076d853e9e19 100755
--- a/bigbluebutton-html5/imports/ui/services/auth/index.js
+++ b/bigbluebutton-html5/imports/ui/services/auth/index.js
@@ -208,7 +208,6 @@ class Auth {
 
   validateAuthToken() {
     return new Promise((resolve, reject) => {
-      // Meteor.connection.setUserId(`${this.meetingID}-${this.userID}`); // TODO__ WHY?!?
       let computation = null;
 
       const validationTimeout = setTimeout(() => {