diff --git a/app/logical/current_user.rb b/app/logical/current_user.rb
index 83a92c808..3f9366c17 100644
--- a/app/logical/current_user.rb
+++ b/app/logical/current_user.rb
@@ -16,7 +16,7 @@ class CurrentUser
 
   def self.as(user_or_id, &block)
     if user_or_id.is_a?(String) || user_or_id.is_a?(Integer)
-      user = User.find(user_or_id)
+      user = ::User.find(user_or_id)
     else
       user = user_or_id
     end
@@ -26,16 +26,16 @@ class CurrentUser
 
   def self.as_admin(&block)
     if block_given?
-      scoped(User.admins.first, "127.0.0.1", &block)
+      scoped(::User.admins.first, "127.0.0.1", &block)
     else
-      self.user = User.admins.first
+      self.user = ::User.admins.first
       self.ip_addr = "127.0.0.1"
     end
   end
 
   def self.as_system(&block)
     if block_given?
-      scoped(User.system, "127.0.0.1", &block)
+      scoped(::User.system, "127.0.0.1", &block)
     else
       self.user = User.system
       self.ip_addr = "127.0.0.1"
diff --git a/app/logical/upload_service/controller_helper.rb b/app/logical/upload_service/controller_helper.rb
index 50d52b3e0..8984f81e2 100644
--- a/app/logical/upload_service/controller_helper.rb
+++ b/app/logical/upload_service/controller_helper.rb
@@ -15,7 +15,7 @@ class UploadService
         if post.nil?
           # this gets called from UploadsController#new so we need
           # to preprocess async
-          Preprocessor.new(source: url).delay(priority: -1, queue: "default").delayed_start(CurrentUser.id)
+          Preprocessor.new(source: url, referer_url: ref).delay(priority: -1, queue: "default").delayed_start(CurrentUser.id)
         end
 
         begin