diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 5d5507384..05b58dabd 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -7,9 +7,8 @@ class UploadsController < ApplicationController
   def new
     @upload = Upload.new
     if params[:url]
-      @post = Post.find_by_source(params[:url])
-
       @normalized_url = params[:url]
+
       headers = {
         "User-Agent" => "#{Danbooru.config.safe_app_name}/#{Danbooru.config.version}"
       }
@@ -17,6 +16,8 @@ class UploadsController < ApplicationController
         @normalized_url, headers = strategy.new.rewrite(@normalized_url, headers)
       end
 
+      @post = Post.find_by_source(@normalized_url)
+
       begin
         @source = Sources::Site.new(params[:url])
       rescue Exception
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index 424b68e90..d325ad52f 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -36,7 +36,7 @@
       <div class="input">
         <%= f.label :source %>
         <% if params[:url].present? %>
-          <%= f.text_field :source, :size => 50, :value => params[:url] %>
+          <%= f.text_field :source, :size => 50, :value => @normalized_url %>
         <% else %>
           <%= f.text_field :source, :size => 50 %>
         <% end %>