diff --git a/app/helpers/bikes_helper.rb b/app/helpers/bikes_helper.rb
deleted file mode 100644
index a2645e4..0000000
--- a/app/helpers/bikes_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module BikesHelper
-end
diff --git a/app/models/bike.rb b/app/models/bike.rb
index e0eabd0..5ce280d 100644
--- a/app/models/bike.rb
+++ b/app/models/bike.rb
@@ -24,7 +24,7 @@ class Bike < ActiveRecord::Base
   end
 
   def self.available_for_freecyclery
-    Bike.all.select{|bike| bike.completion_date && (bike.purpose == "Freecyclery") && !bike.client }
+    Bike.order(log_number: :desc).select{|bike| bike.completion_date && (bike.purpose == "Freecyclery")}
   end
 
   def mark_picked_up
diff --git a/app/views/clients/_fields.html.haml b/app/views/clients/_fields.html.haml
index 6d1e90a..6935a7d 100644
--- a/app/views/clients/_fields.html.haml
+++ b/app/views/clients/_fields.html.haml
@@ -53,7 +53,7 @@
   .form-group
     = f.label "Bike:", class: "col-sm-2 control-label"
     .col-sm-10
-      = f.select(:bike_id, Bike.all.collect {|b| [ b.name, b.id ] }, {include_blank: 'None'})
+      = f.select :bike_id, options_for_select( Bike.available_for_freecyclery.collect{|b| [ b.name, b.id ]}, @client.bike_id )
 
   .form-group
     = f.label "Agency:", class: "col-sm-2 control-label"