diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 45279031..e2d9085d 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -507,8 +507,8 @@ class UserController extends Controller
         $database = $client->selectDB('logging_db');
 
         // query will return a resultset object
-        // TODO: filter query using user id
-        $result = $database->query('SELECT * FROM entity_log');
+        $query_string = 'SELECT * FROM entity_log WHERE "user" = ' . $id;
+        $result = $database->query($query_string);
 
         // get the points from the resultset, which is an array
         $points = $result->getPoints();
diff --git a/templates/user/form.html.twig b/templates/user/form.html.twig
index dba00ef0..f6502795 100644
--- a/templates/user/form.html.twig
+++ b/templates/user/form.html.twig
@@ -58,7 +58,9 @@
 										<span class="m-form__help">Unique alias for this user</span>
 									</div>
                                                                         <div class="col-lg-6">
-                                                                            <a href="{{ url('user_view_logs_form', {'id':obj.getID()}) }}" class="btn btn-success">View Audit Logs</a>
+                                                                            {% if mode == 'update' %}
+                                                                                <a href="{{ url('user_view_logs_form', {'id':obj.getID()}) }}" class="btn btn-success">View Audit Logs</a>
+                                                                            {% endif %}
                                                                         </div>
 								</div>
 								<div class="form-group m-form__group row">