diff --git a/tailbone/views/upgrades.py b/tailbone/views/upgrades.py
index f2751701..6005c14f 100644
--- a/tailbone/views/upgrades.py
+++ b/tailbone/views/upgrades.py
@@ -114,7 +114,7 @@ class UpgradeView(MasterView):
 
     def configure_grid(self, g):
         super(UpgradeView, self).configure_grid(g)
-        g.set_joiner('executed_by', lambda q: q.join(model.User).outerjoin(model.Person))
+        g.set_joiner('executed_by', lambda q: q.join(model.User, model.User.uuid == model.Upgrade.executed_by_uuid).outerjoin(model.Person))
         g.set_sorter('executed_by', model.Person.display_name)
         g.set_enum('status_code', self.enum.UPGRADE_STATUS)
         g.set_type('created', 'datetime')