diff --git a/app/controllers/vehicles_controller.rb b/app/controllers/vehicles_controller.rb
index 4f31eee..a1632a2 100644
--- a/app/controllers/vehicles_controller.rb
+++ b/app/controllers/vehicles_controller.rb
@@ -37,8 +37,7 @@ class VehiclesController < ApplicationController
   # return an HTML form for creating a new vehicle
   def new
     @vehicle = Vehicle.new
-    @customers = Customer.all.order(:name)
-    @customer = params[:customer_id] if params[:customer_id]
+    @customer = Customer.find_by_id(params[:customer_id]) if params[:customer_id]
   end
 
   # create a new vehicle
@@ -67,8 +66,7 @@ class VehiclesController < ApplicationController
   def edit
     begin
       @vehicle = Vehicle.find_by_id(params[:id])
-      @customer = @vehicle.customer.id
-      @customers = Customer.all.order(:name)
+      @customer = @vehicle.customer
     rescue ActiveRecord::RecordNotFound
       render_404
     end
diff --git a/app/views/vehicles/_form.html.erb b/app/views/vehicles/_form.html.erb
index 9409aca..8de9048 100644
--- a/app/views/vehicles/_form.html.erb
+++ b/app/views/vehicles/_form.html.erb
@@ -4,10 +4,10 @@
 
       <%= form_for @vehicle do |f| %> 
         <div class="clearfix">
-          Customer: 
+		Customer:
 	  <div class="input">
-		  <%= f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :selected => @customer, :update_elements => {:id => '#customer_id', :value => '#issue_customer'}, :required => true %>
-		  <%= f.hidden_field :customer_id, :id => "customer_id" %>
+		  <%= f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :value => @customer.name, :update_elements => {:id => '#customer_id', :value => '#issue_customer'}, :required => true %>
+		  <%= f.hidden_field :customer_id, :id => "customer_id", :value => @customer.id %>
             </div>
         </div>