diff --git a/app/assets/javascripts/auto_suggest.js.coffee b/app/assets/javascripts/auto_suggest.js.coffee
index 60e9304c0..335e27d8d 100644
--- a/app/assets/javascripts/auto_suggest.js.coffee
+++ b/app/assets/javascripts/auto_suggest.js.coffee
@@ -33,5 +33,5 @@ jQuery ->
el.data( 'uiAutocomplete' )._renderItem = ( ul, item ) ->
$( '
' )
.data( 'item.autocomplete', item )
- .append( "#{item.name}" )
+ .append( if item.matched_alternate_name then "#{item.matched_alternate_name} (#{item.name})" else "#{item.name}" )
.appendTo( ul )
diff --git a/app/assets/javascripts/planting_alternate_name.js.coffee b/app/assets/javascripts/planting_alternate_name.js.coffee
new file mode 100644
index 000000000..3d777e325
--- /dev/null
+++ b/app/assets/javascripts/planting_alternate_name.js.coffee
@@ -0,0 +1,26 @@
+# When a crop is chosen in the planting form, offer that crop's alternate names.
+# Searching by an alternate name ("lauki") preselects it.
+jQuery ->
+ wrapper = $( '#planting-alternate-name' )
+ return unless wrapper.length
+
+ select = wrapper.find( 'select' )
+ crop_id = $( '#planting_crop_id' )
+ crop_input = $( '#crop' )
+
+ load = ( id, typed ) ->
+ select.empty()
+ return wrapper.addClass( 'd-none' ) unless id
+ $.getJSON wrapper.data( 'source-url' ), { crop_id: id }, ( names ) ->
+ select.append( $( '