diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a836a86..901a86b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@
 - Show admins the email server error message when email sending fails
 - Fix issue where the current theme cannot be found in list of themes
 - Fix page preview so that it accounts for the provided format
+- Add links from User/Team Profile IP addresses to a User IP address search page
+- Add city geolocation to Team Profile IP addresses
 
 **API**
 
diff --git a/CTFd/themes/admin/templates/modals/teams/addresses.html b/CTFd/themes/admin/templates/modals/teams/addresses.html
index aacd8a2d..bbc22f58 100644
--- a/CTFd/themes/admin/templates/modals/teams/addresses.html
+++ b/CTFd/themes/admin/templates/modals/teams/addresses.html
@@ -1,40 +1,49 @@
 <div class="row">
-    <div class="col-md-12">
-        <table class="table table-striped">
-            <thead>
-                <tr>
-                    <td class="text-center"><b>User</b></td>
-                    <td class="text-center"><b>IP Address</b></td>
-                    <td class="text-center"><b>Last Seen</b></td>
-                    <td class="text-center"><b>Country</b></td>
-                </tr>
-            </thead>
-            <tbody>
-            {% for addr in addrs %}
-                <tr>
-                    <td class="text-center">
-                        <a href="{{ url_for("admin.users_detail", user_id=addr.user_id) }}">
-                            {{ addr.user.name }}
-                        </a>
-                    </td>
-                    <td class="text-center">{{ addr.ip }}</td>
-                    <td class="text-center solve-time">
-                        <span data-time="{{ addr.date | isoformat }}"></span>
-                    </td>
-                    {% set country = lookup_ip_address(addr.ip) %}
-                    {% if country %}
-                    <td class="text-center">
-                        <i class="flag-{{ country.lower() }}"></i>
-                        &nbsp;
-                        {{ lookup_country_code(country) }}
-                    </td>
-                    {% else %}
-                    <td class="text-center">
-                    </td>
-                    {% endif %}
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-    </div>
+	<div class="col-md-12">
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<td class="text-center"><b>User</b></td>
+					<td class="text-center"><b>IP Address</b></td>
+					<td class="text-center"><b>Last Seen</b></td>
+					<td class="text-center"><b>City</b></td>
+					<td class="text-center"><b>Country</b></td>
+				</tr>
+			</thead>
+			<tbody>
+			{% for addr in addrs %}
+				<tr>
+					<td class="text-center">
+						<a href="{{ url_for("admin.users_detail", user_id=addr.user_id) }}">
+							{{ addr.user.name }}
+						</a>
+					</td>
+					<td class="text-center">
+						<a href="{{ url_for('admin.users_listing', field='ip', q=addr.ip) }}">
+							{{ addr.ip }}
+						</a>
+					</td>
+					<td class="text-center solve-time">
+						<span data-time="{{ addr.date | isoformat }}"></span>
+					</td>
+					{% set city = lookup_ip_address_city(addr.ip) %}
+					<td class="text-center">
+						{% if city %}{{ city }}{% endif %}
+					</td>
+					{% set country = lookup_ip_address(addr.ip) %}
+					<td class="text-center">
+						{% if country %}
+						<i class="flag-{{ country.lower() }}"></i>
+						&nbsp;
+						{{ lookup_country_code(country) }}
+						{% endif %}
+					</td>
+				</tr>
+			{% endfor %}
+			</tbody>
+		</table>
+		<small class="float-right">
+			<a class="text-muted" href='https://db-ip.com'>IP Geolocation by DB-IP</a>
+		</small>
+	</div>
 </div>
diff --git a/CTFd/themes/admin/templates/modals/users/addresses.html b/CTFd/themes/admin/templates/modals/users/addresses.html
index c0e60023..4012e3a9 100644
--- a/CTFd/themes/admin/templates/modals/users/addresses.html
+++ b/CTFd/themes/admin/templates/modals/users/addresses.html
@@ -12,7 +12,11 @@
 			<tbody>
 			{% for addr in addrs %}
 				<tr>
-					<td class="text-center">{{ addr.ip }}</td>
+					<td class="text-center">
+						<a href="{{ url_for('admin.users_listing', field='ip', q=addr.ip) }}">
+							{{ addr.ip }}
+						</a>
+					</td>
 					<td class="text-center solve-time">
 						<span data-time="{{ addr.date | isoformat }}"></span>
 					</td>