diff --git a/lib/dmpopidor/controllers/users.rb b/lib/dmpopidor/controllers/users.rb
index e70c79d..57b66d0 100644
--- a/lib/dmpopidor/controllers/users.rb
+++ b/lib/dmpopidor/controllers/users.rb
@@ -12,10 +12,10 @@
         respond_to do |format|
           format.html do
             if current_user.can_super_admin?
-              @users = User.page(1)
+              @users = User.order("last_sign_in_at is NULL, last_sign_in_at desc").page(1)
               @total_users = User.count
             else
-              @users = current_user.org.users.page(1)
+              @users = current_user.org.users.order("last_sign_in_at is NULL, last_sign_in_at desc").page(1)
               @total_users = current_user.org.users.count
             end
           end