diff --git a/pick.lic b/pick.lic
index 566c89df8a..fa218c517e 100644
--- a/pick.lic
+++ b/pick.lic
@@ -102,7 +102,7 @@ class Pick
 
     @picking_room_id = Room.current.id
 
-    @refill_town = @settings.refill_town
+    @refill_town = @settings.refill_town = @settings.refill_town.to_s
 
     if @debug
       echo "Settings..."
@@ -134,10 +134,10 @@ class Pick
       echo "- assumed_difficulty: #{@assumed_difficulty}"
     end
 
-    if @settings.refill_town
-      @lockpick_costs = picking_data['lockpick_costs'][@settings.refill_town]
-    else
+    if @refill_town.empty?
       @lockpick_costs = picking_data['lockpick_costs'][@settings.fang_cove_override_town || @settings.hometown]
+    else
+      @lockpick_costs = picking_data['lockpick_costs'][@settings.refill_town]
     end
 
     if args.refill
@@ -325,16 +325,16 @@ class Pick
       return
     end
 
-    if @refill_town
-      DRCM.ensure_copper_on_hand(cost * lockpicks_needed, @settings, @refill_town)
-    else
+    if @refill_town.empty?
       DRCM.ensure_copper_on_hand(cost * lockpicks_needed, @settings)
+    else
+      DRCM.ensure_copper_on_hand(cost * lockpicks_needed, @settings, @refill_town)
     end
 
-    if @refill_town
-      DRCT.refill_lockpick_container(@settings.lockpick_type, @refill_town, @lockpick_container, lockpicks_needed)
-    else
+    if @refill_town.empty?
       DRCT.refill_lockpick_container(@settings.lockpick_type, @settings.fang_cove_override_town || @settings.hometown, @lockpick_container, lockpicks_needed)
+    else
+      DRCT.refill_lockpick_container(@settings.lockpick_type, @refill_town, @lockpick_container, lockpicks_needed)
     end
   end