diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 0ccaee02513..7401077ee63 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -98,6 +98,10 @@
               {{#if user.moderator}}
                 {{d-icon "shield" title="admin.moderator" }}
               {{/if}}
+
+              {{#if user.second_factor_enabled}}
+                {{d-icon "lock" title="admin.user.second_factor_enabled" }}
+              {{/if}}
             </td>
           </tr>
         {{/each}}
diff --git a/app/serializers/admin_user_list_serializer.rb b/app/serializers/admin_user_list_serializer.rb
index e4a95b3efb1..32021dad747 100644
--- a/app/serializers/admin_user_list_serializer.rb
+++ b/app/serializers/admin_user_list_serializer.rb
@@ -25,7 +25,8 @@ class AdminUserListSerializer < BasicUserSerializer
              :silenced,
              :silenced_till,
              :time_read,
-             :staged
+             :staged,
+             :second_factor_enabled
 
   [:days_visited, :posts_read_count, :topics_entered, :post_count].each do |sym|
     attributes sym
@@ -115,4 +116,12 @@ class AdminUserListSerializer < BasicUserSerializer
     SiteSetting.must_approve_users
   end
 
+  def include_second_factor_enabled?
+    object.totp_enabled?
+  end
+
+  def second_factor_enabled
+    true
+  end
+
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index dfb6f115a83..590c6fa1887 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3471,6 +3471,7 @@ en:
         private_topics_count: Private Topics
         posts_read_count: Posts Read
         post_count: Posts Created
+        second_factor_enabled: Two Factor Authentication Enabled
         topics_entered: Topics Viewed
         flags_given_count: Flags Given
         flags_received_count: Flags Received
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index b9d74e8a52d..fd3da2a23af 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -63,7 +63,7 @@ class AdminUserIndexQuery
     if params[:stats].present? && params[:stats] == false
       klass.order(order.reject(&:blank?).join(","))
     else
-      klass.includes(:user_stat).order(order.reject(&:blank?).join(","))
+      klass.includes(:user_stat, :user_second_factor).order(order.reject(&:blank?).join(","))
     end
   end