diff --git a/app/views/contracts/_form.html.erb b/app/views/contracts/_form.html.erb
index 25fad60..8976664 100644
--- a/app/views/contracts/_form.html.erb
+++ b/app/views/contracts/_form.html.erb
@@ -1,6 +1,6 @@
 <% form.inputs do %>
   <%= form.input :name, :required => true %>
-  <%= form.input :account_executive, :required => true %>
+  <%= form.input :account_executive, :required => true, :collection => @project.users.sort %>
   <li class="boolean optional">
     <%= label('contract', 'executed') %>
     <%= check_box 'contract', 'executed' %>
diff --git a/test/integration/contracts_edit_test.rb b/test/integration/contracts_edit_test.rb
index 4840985..a3530e9 100644
--- a/test/integration/contracts_edit_test.rb
+++ b/test/integration/contracts_edit_test.rb
@@ -5,7 +5,10 @@ class ContractsEditTest < ActionController::IntegrationTest
   
   def setup
     @project = Project.generate!(:identifier => 'main')
-    @contract = Contract.generate!(:project => @project, :name => 'A Contract', :payment_terms => 'net_15')
+    @account_executive = User.generate!
+    @role = Role.generate!
+    User.add_to_project(@account_executive, @project, @role)
+    @contract = Contract.generate!(:project => @project, :name => 'A Contract', :payment_terms => 'net_15', :account_executive => @account_executive)
   end
 
   should "allow any user to edit the contract" do
diff --git a/test/integration/contracts_new_test.rb b/test/integration/contracts_new_test.rb
index c38d554..d3db4c8 100644
--- a/test/integration/contracts_new_test.rb
+++ b/test/integration/contracts_new_test.rb
@@ -17,6 +17,8 @@ class ContractsNewTest < ActionController::IntegrationTest
 
   should "create a new contract" do
     @account_executive = User.generate!
+    @role = Role.generate!
+    User.add_to_project(@account_executive, @project, @role)
 
     visit_contracts_for_project(@project)
     click_link 'New Contract'