diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index a97944aa..34d29d18 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -34,13 +34,13 @@ def show
   # GET /pages/new
   def new
     @page = Page.new
-    @users = User.all
+    @users = User.all.sort_by { |obj| (obj.display_name.nil? ? 0 : obj.display_name.downcase) }
     @slack_integrations = SlackIntegration.all
   end
 
   # GET /pages/1/edit
   def edit
-    @users = User.all
+    @users = User.all.sort_by { |obj| (obj.display_name.nil? ? 0 : obj.display_name.downcase) }
     @slack_integrations = SlackIntegration.all
   end