diff --git a/CHANGELOG b/CHANGELOG
index 175399fe1fae4b1c9d7a4a10aae149035251fab1..d672d4083183953f17aeec9a10e8d1ec9c7ca41e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ v 8.4.0 (unreleased)
   - Improved performance of finding issues for an entire group (Yorick Peterse)
   - Added custom application performance measuring system powered by InfluxDB (Yorick Peterse)
   - Bump fog to 1.36.0 (Stan Hu)
+  - Add user's last used IP addresses to admin page (Stan Hu)
   - Add housekeeping function to project settings page
   - The default GitLab logo now acts as a loading indicator
   - Fix caching issue where build status was not updating in project dashboard (Stan Hu)
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 2c2450d4117ae3cc76a677dc72c16634296fb999..2bdbae195880edfd7a83c81d57268d24fcd6403a 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -70,6 +70,14 @@
             %strong.cred
               No
 
+        %li
+          %span.light Current sign-in IP:
+          %strong
+            - if @user.current_sign_in_ip
+              = @user.current_sign_in_ip
+            - else
+              never
+
         %li
           %span.light Current sign-in at:
           %strong
@@ -78,6 +86,14 @@
             - else
               never
 
+        %li
+          %span.light Last sign-in IP:
+          %strong
+            - if @user.last_sign_in_ip
+              = @user.last_sign_in_ip
+            - else
+              never
+
         %li
           %span.light Last sign-in at:
           %strong