diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 158486921837b6067b8e96a5d87a8f4a8bfe0590..4f54538ab74e5afd3c440cb18f58fea7ba38ebd5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -32,6 +32,7 @@ Fixed
   and images were displayed only partially.
 * Error message in permission form was misleading.
 * Personal invites did not work
+* Invite Person view threw an error when personal invites existed
 
 Removed
 ~~~~~~~
diff --git a/aleksis/core/locale/ar/LC_MESSAGES/django.po b/aleksis/core/locale/ar/LC_MESSAGES/django.po
index df6153f7196d2535a19143cb11bfa43a0f831953..ce6e7cbbf7d64d4beb966c224212bbda2b32af2f 100644
--- a/aleksis/core/locale/ar/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/ar/LC_MESSAGES/django.po
@@ -2052,7 +2052,7 @@ msgstr ""
 #: aleksis/core/templates/core/pages/system_status.html:24
 msgid ""
 "\n"
-"                Only admin and visitors from internal IPs can access thesite.\n"
+"                Only admin and visitors from internal IPs can access the site.\n"
 "              "
 msgstr ""
 
diff --git a/aleksis/core/locale/de_DE/LC_MESSAGES/django.po b/aleksis/core/locale/de_DE/LC_MESSAGES/django.po
index 7f2dcc874f2a27ea8cf2b0d8b7fd681e17e419f8..47480319a7caddf203af0a5823a09753dcb8814c 100644
--- a/aleksis/core/locale/de_DE/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/de_DE/LC_MESSAGES/django.po
@@ -2308,7 +2308,7 @@ msgstr "Wartungsmodus aktiviert"
 msgid ""
 "\n"
 "                Only admin and visitors from internal IPs can access "
-"thesite.\n"
+"the site.\n"
 "              "
 msgstr ""
 "\n"
diff --git a/aleksis/core/locale/fr/LC_MESSAGES/django.po b/aleksis/core/locale/fr/LC_MESSAGES/django.po
index b57a1588c4fb9a13d74200af11aa150a0f7b2c7d..8bc699a6898347499a588ac071ded207c301d4c3 100644
--- a/aleksis/core/locale/fr/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/fr/LC_MESSAGES/django.po
@@ -2130,7 +2130,7 @@ msgstr ""
 #: aleksis/core/templates/core/pages/system_status.html:24
 msgid ""
 "\n"
-"                Only admin and visitors from internal IPs can access thesite.\n"
+"                Only admin and visitors from internal IPs can access the site.\n"
 "              "
 msgstr ""
 
diff --git a/aleksis/core/locale/la/LC_MESSAGES/django.po b/aleksis/core/locale/la/LC_MESSAGES/django.po
index b75d5e04731de1445f993badba1509a713f9e474..f75c1ff3027200fcc1f340efe6a34b17cb4e3529 100644
--- a/aleksis/core/locale/la/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/la/LC_MESSAGES/django.po
@@ -2238,7 +2238,7 @@ msgstr ""
 #: aleksis/core/templates/core/pages/system_status.html:24
 msgid ""
 "\n"
-"                Only admin and visitors from internal IPs can access thesite.\n"
+"                Only admin and visitors from internal IPs can access the site.\n"
 "              "
 msgstr ""
 
diff --git a/aleksis/core/locale/nb_NO/LC_MESSAGES/django.po b/aleksis/core/locale/nb_NO/LC_MESSAGES/django.po
index c5d7f44167fc0d9207afcc857d56d3fecb23e834..a4ef0700a3b00bab188af924342dd605c6624b21 100644
--- a/aleksis/core/locale/nb_NO/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/nb_NO/LC_MESSAGES/django.po
@@ -2051,7 +2051,7 @@ msgstr ""
 #: aleksis/core/templates/core/pages/system_status.html:24
 msgid ""
 "\n"
-"                Only admin and visitors from internal IPs can access thesite.\n"
+"                Only admin and visitors from internal IPs can access the site.\n"
 "              "
 msgstr ""
 
diff --git a/aleksis/core/locale/ru/LC_MESSAGES/django.po b/aleksis/core/locale/ru/LC_MESSAGES/django.po
index 722b473df4cad72ab8b7988d21325946bc6db3ee..378e7a1a676224c921dfb2f19c2d4cb5507c420f 100644
--- a/aleksis/core/locale/ru/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/ru/LC_MESSAGES/django.po
@@ -2248,7 +2248,7 @@ msgstr "Включен режим обслуживания"
 msgid ""
 "\n"
 "                Only admin and visitors from internal IPs can access "
-"thesite.\n"
+"the site.\n"
 "              "
 msgstr ""
 "\n"
diff --git a/aleksis/core/locale/tr_TR/LC_MESSAGES/django.po b/aleksis/core/locale/tr_TR/LC_MESSAGES/django.po
index c6ea389cc19f7b8da9cd26512cca741c38b41311..aa34c1560b1444e80ac7c9fb86995b007142332e 100644
--- a/aleksis/core/locale/tr_TR/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/tr_TR/LC_MESSAGES/django.po
@@ -2051,7 +2051,7 @@ msgstr ""
 #: aleksis/core/templates/core/pages/system_status.html:24
 msgid ""
 "\n"
-"                Only admin and visitors from internal IPs can access thesite.\n"
+"                Only admin and visitors from internal IPs can access the site.\n"
 "              "
 msgstr ""
 
diff --git a/aleksis/core/locale/uk/LC_MESSAGES/django.po b/aleksis/core/locale/uk/LC_MESSAGES/django.po
index 58a52db0bbb5a0611820645658142a54de9b6e89..a5987d90d6bc2c3b1b54920ea0601d4f148eec23 100644
--- a/aleksis/core/locale/uk/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/uk/LC_MESSAGES/django.po
@@ -2282,7 +2282,7 @@ msgstr "Активований режим обслуговування"
 msgid ""
 "\n"
 "                Only admin and visitors from internal IPs can access "
-"thesite.\n"
+"the site.\n"
 "              "
 msgstr ""
 "\n"
diff --git a/aleksis/core/tables.py b/aleksis/core/tables.py
index a58c3fc443b3ad66c8df31109cbb6276192518ef..c912d13477c607e3374b3c8b4619338a8cb8a6a0 100644
--- a/aleksis/core/tables.py
+++ b/aleksis/core/tables.py
@@ -156,7 +156,7 @@ class PersonColumn(tables.Column):
     """Returns person object from given id."""
 
     def render(self, value):
-        return Person.objects.get(user__id=value)
+        return Person.objects.get(pk=value)
 
 
 class InvitationCodeColumn(tables.Column):
diff --git a/aleksis/core/templates/core/pages/system_status.html b/aleksis/core/templates/core/pages/system_status.html
index 4eee117807c2b2a45a1271e1f4aa9673189d105d..7f0e7bff0840029b500620662cd4681ac6bddded 100644
--- a/aleksis/core/templates/core/pages/system_status.html
+++ b/aleksis/core/templates/core/pages/system_status.html
@@ -22,7 +22,7 @@
             <p class="flow-text">{% blocktrans %}Maintenance mode enabled{% endblocktrans %}</p>
             <p class="grey-text">
               {% blocktrans %}
-                Only admin and visitors from internal IPs can access thesite.
+                Only admin and visitors from internal IPs can access the site.
               {% endblocktrans %}
             </p>
           </div>