diff --git a/app/models/user.rb b/app/models/user.rb
index 9f1ea9fdc7f..6ce3ce4d1e0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -923,7 +923,7 @@ class User < ActiveRecord::Base
   end
 
   def clear_global_notice_if_needed
-    return if id === Discourse.system_user.id
+    return if id == Discourse::SYSTEM_USER_ID
 
     if admin && SiteSetting.has_login_hint
       SiteSetting.has_login_hint = false