diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index b06226798..10f240af9 100644
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -6,7 +6,7 @@ class ArtistsController < ApplicationController
   before_action :load_artist, :only => [:ban, :unban, :show, :edit, :update, :destroy, :undelete]
 
   def new
-    @artist = Artist.new_with_defaults(artist_params)
+    @artist = Artist.new_with_defaults(artist_params(:new))
     respond_with(@artist)
   end
 
@@ -104,9 +104,10 @@ private
     sp.permit!
   end
 
-  def artist_params
+  def artist_params(context = nil)
     permitted_params = %i[name other_names other_names_string group_name url_string notes]
     permitted_params << :is_active if CurrentUser.is_builder?
+    permitted_params << :source if context == :new
 
     params.fetch(:artist, {}).permit(permitted_params)
   end
diff --git a/app/logical/sources/strategies/base.rb b/app/logical/sources/strategies/base.rb
index 822924c14..329f87c71 100644
--- a/app/logical/sources/strategies/base.rb
+++ b/app/logical/sources/strategies/base.rb
@@ -166,6 +166,16 @@ module Sources
         Artist.find_artists(normalize_for_artist_finder)
       end
 
+      # A new artist entry with suggested defaults for when the artist doesn't
+      # exist. Used in Artist.new_with_defaults to prefill the new artist form.
+      def new_artist
+        Artist.new(
+          name: unique_id,
+          other_names: [artist_name],
+          url_string: [profile_url, normalize_for_artist_finder].sort.uniq.join("\n")
+        )
+      end
+
       def file_url
         image_url
       end
diff --git a/app/models/artist.rb b/app/models/artist.rb
index c5379f531..ab3da1040 100644
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -310,17 +310,26 @@ class Artist < ApplicationRecord
   end
 
   module FactoryMethods
+    # Make a new artist, fetching the defaults either from the given source, or
+    # from the source of the artist's last upload.
     def new_with_defaults(params)
-      Artist.new(params).tap do |artist|
-        if artist.name.present?
-          post = CurrentUser.without_safe_mode do
-            Post.tag_match("source:http #{artist.name}").where("true /* Artist.new_with_defaults */").first
-          end
-          unless post.nil? || post.source.blank?
-            artist.url_string = post.source
-          end
+      source = params.delete(:source)
+
+      if source.blank? && params[:name].present?
+        CurrentUser.without_safe_mode do
+          post = Post.tag_match("source:http* #{params[:name]}").first
+          source = post.try(:source)
         end
       end
+
+      if source.present?
+        artist = Sources::Strategies.find(source).new_artist
+        artist.attributes = params
+      else
+        artist = Artist.new(params)
+      end
+
+      artist.tap(&:validate) # run before_validation callbacks to normalize the names
     end
   end
 
diff --git a/app/views/sources/_info.html.erb b/app/views/sources/_info.html.erb
index da23706df..17a424077 100644
--- a/app/views/sources/_info.html.erb
+++ b/app/views/sources/_info.html.erb
@@ -15,7 +15,7 @@
             <%= link_to @source.artist_name, @source.profile_url, id: "source-info-artist-profile" %>
 
             <% if @source.artists.empty? %>
-              (<%= link_to "Create new artist", new_artist_path(artist: { name: @source.unique_id, other_names: @source.artist_name, url_string: [@source.profile_url, @source.normalize_for_artist_finder].uniq.sort.join("\n") }), id: "source-info-create-new-artist" %>)
+              (<%= link_to "Create new artist", new_artist_path(artist: { source: @source.canonical_url }), id: "source-info-create-new-artist" %>)
             <% else %>
               (<ul id="source-info-translated-artists">
                 <% @source.artists.each do |artist| %>
diff --git a/test/unit/artist_test.rb b/test/unit/artist_test.rb
index 600cb42b2..7bc3f9cc5 100644
--- a/test/unit/artist_test.rb
+++ b/test/unit/artist_test.rb
@@ -550,5 +550,26 @@ class ArtistTest < ActiveSupport::TestCase
         assert_equal(1, @artist.urls.count)
       end
     end
+
+    context "#new_with_defaults" do
+      should "fetch the defaults from the given source" do
+        source = "https://i.pximg.net/img-original/img/2018/01/28/23/56/50/67014762_p0.jpg"
+        artist = Artist.new_with_defaults(source: source)
+
+        assert_equal("niceandcool", artist.name)
+        assert_equal("nice_and_cool", artist.other_names_string)
+        assert_equal("https://www.pixiv.net/member.php?id=906442", artist.url_string)
+      end
+
+      should "fetch the defaults from the given tag" do
+        source = "https://i.pximg.net/img-original/img/2018/01/28/23/56/50/67014762_p0.jpg"
+        FactoryBot.create(:post, source: source, tag_string: "test_artist")
+        artist = Artist.new_with_defaults(name: "test_artist")
+
+        assert_equal("test_artist", artist.name)
+        assert_equal("nice_and_cool", artist.other_names_string)
+        assert_equal("https://www.pixiv.net/member.php?id=906442", artist.url_string)
+      end
+    end
   end
 end