diff --git a/pick.lic b/pick.lic
index d28257ba9e..566c89df8a 100644
--- a/pick.lic
+++ b/pick.lic
@@ -64,7 +64,6 @@ class Pick
     @has_pick_waggle = @settings.waggle_sets['pick']
 
     picking_data = get_data('picking').picking
-    @lockpick_costs = picking_data['lockpick_costs'][@settings.fang_cove_override_town || @settings.hometown]
 
     @pick_identify_messages = picking_data['pick_messages_by_difficulty'];
     @pick_retry = picking_data['pick_retry']
@@ -103,6 +102,8 @@ class Pick
 
     @picking_room_id = Room.current.id
 
+    @refill_town = @settings.refill_town
+
     if @debug
       echo "Settings..."
       echo "- Sources: #{@sources}"
@@ -133,6 +134,12 @@ class Pick
       echo "- assumed_difficulty: #{@assumed_difficulty}"
     end
 
+    if @settings.refill_town
+      @lockpick_costs = picking_data['lockpick_costs'][@settings.refill_town]
+    else
+      @lockpick_costs = picking_data['lockpick_costs'][@settings.fang_cove_override_town || @settings.hometown]
+    end
+
     if args.refill
       refill_ring
     elsif stop_picking?
@@ -318,8 +325,17 @@ class Pick
       return
     end
 
-    DRCM.ensure_copper_on_hand(cost * lockpicks_needed, @settings)
-    DRCT.refill_lockpick_container(@settings.lockpick_type, @settings.fang_cove_override_town || @settings.hometown, @lockpick_container, lockpicks_needed)
+    if @refill_town
+      DRCM.ensure_copper_on_hand(cost * lockpicks_needed, @settings, @refill_town)
+    else
+      DRCM.ensure_copper_on_hand(cost * lockpicks_needed, @settings)
+    end
+
+    if @refill_town
+      DRCT.refill_lockpick_container(@settings.lockpick_type, @refill_town, @lockpick_container, lockpicks_needed)
+    else
+      DRCT.refill_lockpick_container(@settings.lockpick_type, @settings.fang_cove_override_town || @settings.hometown, @lockpick_container, lockpicks_needed)
+    end
   end
 
   def attempt_open(box_noun)