diff --git a/scipost/urls.py b/scipost/urls.py
index d164a044dcfed986f3e346a27fdff82a2642e9d0..5f3609a5005b6eea0e60a2f5d0816cc07c6300c2 100644
--- a/scipost/urls.py
+++ b/scipost/urls.py
@@ -32,7 +32,7 @@ urlpatterns = [
     url(r'^registration_invitations$', views.registration_invitations, name="registration_invitations"),
     url(r'^registration_invitation_sent$', TemplateView.as_view(template_name='scipost/registration_invitation_sent.html'), name='registration_invitation_sent'),
     #url(r'^invitation/(?P<key>.+)$', views.accept_invitation, name='accept_invitation'),
-    url(r'^invitation/(?P<key>.+)$', views.accept_invitation, name='accept_invitation'),
+    url(r'^invitation/(?P<key>.+)$', views.invitation, name='invitation'),
     url(r'^accept_invitation_error$', TemplateView.as_view(template_name='scipost/accept_invitation_error.html'), name='accept_invitation_error'),
 
     ## Authentication
diff --git a/scipost/views.py b/scipost/views.py
index 84aace613a8b5c627ce869a4c155b541e039fae9..398001a56950034bcd272fd68e0fe9058e991de5 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -108,7 +108,7 @@ def register(request):
     return render(request, 'scipost/register.html', context)
 
 
-def accept_invitation(request, key):
+def invitation(request, key):
     """ Register, by invitation """
     invitation = get_object_or_404(RegistrationInvitation, invitation_key=key)
     if request.method == 'POST':
@@ -116,13 +116,13 @@ def accept_invitation(request, key):
         Utils.load({'form': form})
         if form.is_valid():
             if Utils.password_mismatch():
-                return render(request, reverse('accept_invitation', kwargs={'key': key}),
+                return render(request, reverse('invitation', kwargs={'key': key}),
                               {'form': form, 'invited': True, 'errormessage': 'Your passwords must match'})
             if Utils.username_already_taken():
-                return render(request, reverse('accept_invitation', kwargs={'key': key}),
+                return render(request, reverse('invitation', kwargs={'key': key}),
                               {'form': form, 'invited': True, 'errormessage': 'This username is already in use'})
             if Utils.email_already_taken():
-                return render(request, reverse('accept_invitation', kwargs={'key': key}),
+                return render(request, reverse('invitation', kwargs={'key': key}),
                               {'form': form, 'invited': True, 'errormessage': 'This email address is already in use'})
             Utils.create_and_save_contributor()
             Utils.send_registration_email()
@@ -142,7 +142,7 @@ def accept_invitation(request, key):
         form.fields['email'].initial = invitation.email_address
         errormessage = ''
         welcome_message = 'Welcome, ' + title_dict[invitation.title] + ' ' + invitation.last_name + ', and thanks in advance for registering (by completing this form)'
-        return render(request, reverse('accept_invitation', kwargs={'key': key}), 
+        return render(request, reverse('invitation', kwargs={'key': key}), 
                       {'form': form, 'invited': True, 'errormessage': errormessage, 'welcome_message': welcome_message})
 
     context = {'errormessage': errormessage}