diff --git a/app/models/user.rb b/app/models/user.rb
index 9c9003b..500336e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -247,9 +247,9 @@ class User < ApplicationRecord
 
     self.slack_avatar_url = profile["image_192"] || profile["image_72"]
 
-    self.slack_username = user_data["name"].presence
-    self.slack_username ||= profile["display_name_normalized"].presence
+    self.slack_username = profile["display_name_normalized"].presence
     self.slack_username ||= profile["real_name_normalized"].presence
+    self.slack_username ||= user_data["name"].presence
   end
 
   def update_slack_status
@@ -381,9 +381,9 @@ class User < ApplicationRecord
     end
 
     user.slack_uid = data.dig("authed_user", "id")
-    user.slack_username = slack_user["name"].presence
-    user.slack_username ||= profile["display_name_normalized"].presence
+    user.slack_username = profile["display_name_normalized"].presence
     user.slack_username ||= profile["real_name_normalized"].presence
+    user.slack_username ||= slack_user["name"].presence
     user.slack_avatar_url = profile["image_192"] || profile["image_72"]
 
     user.parse_and_set_timezone(slack_user["tz"])