Added default order to UserFinder

2 files changed, 6 insertions, 2 deletions

diff --git a/app/finders/users_finder.rb b/app/finders/users_finder.rb
index 1a7e97004fb..edde8022ec9 100644
--- a/app/finders/users_finder.rb
+++ b/app/finders/users_finder.rb
@@ -25,7 +25,7 @@ class UsersFinder
   end
 
   def execute
-    users = User.all
+    users = User.all.order_id_desc
     users = by_username(users)
     users = by_search(users)
     users = by_blocked(users)
diff --git a/app/models/user.rb b/app/models/user.rb
index 14941fd7f98..5e7fe01c825 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -487,7 +487,11 @@ class User < ActiveRecord::Base
   end
 
   def two_factor_u2f_enabled?
-    u2f_registrations.exists?
+    if u2f_registrations.loaded?
+      u2f_registrations.any?
+    else
+      u2f_registrations.exists?
+    end
   end
 
   def namespace_uniq