diff --git a/app/views/locker_applications/new.html.erb b/app/views/locker_applications/new.html.erb
index b212ab9..08ec89e 100644
--- a/app/views/locker_applications/new.html.erb
+++ b/app/views/locker_applications/new.html.erb
@@ -1,8 +1,8 @@
 <% content_for :title do %>
 Locker application
 <% end %>
-<% if Flipflop.lewis_patrons? %>
-  <%= render 'building_select_form', locker_application: @locker_application %>
-<% else %>
+<% if current_user.admin? || !Flipflop.lewis_patrons? %>
   <%= render 'form', locker_application: @locker_application %>
+<% else %>
+  <%= render 'building_select_form', locker_application: @locker_application %>
 <% end %>
diff --git a/spec/features/locker_application_new_spec.rb b/spec/features/locker_application_new_spec.rb
index ca4c3eb..0b4ccfd 100644
--- a/spec/features/locker_application_new_spec.rb
+++ b/spec/features/locker_application_new_spec.rb
@@ -162,8 +162,6 @@
 
         it 'can assign the application to an existing user' do
           visit root_path
-          select('Firestone Library', from: :locker_application_building_id)
-          click_button('Next')
           new_application = LockerApplication.last
           expect(new_application.user).to eq(admin)
           expect(page).to have_content('Firestone Library Locker Application')