diff --git a/src/main/java/tiqr/org/DefaultTiqrService.java b/src/main/java/tiqr/org/DefaultTiqrService.java
index d33b821..c88e326 100644
--- a/src/main/java/tiqr/org/DefaultTiqrService.java
+++ b/src/main/java/tiqr/org/DefaultTiqrService.java
@@ -107,7 +107,7 @@ public Registration enrollData(Registration registration) throws TiqrException {
         registration.setCreated(now);
         registration.setUpdated(now);
         registration.setId(enrollment.getRegistrationId());
-        registration.setUsePrimaryIdentifier(true);
+        registration.setUseRegistrationId(true);
 
         Registration savedRegistration = registrationRepository.save(registration);
 
@@ -149,7 +149,7 @@ public Authentication startAuthentication(String userId, String userDisplayName,
         String challenge = Challenge.generateQH10Challenge();
         String authenticationUrl = String.format("%s/tiqrauth/?u=%s&s=%s&q=%s&i=%s&v=%s",
                 eduIdAppBaseUrl,
-                encode(registration.isUsePrimaryIdentifier() ? registration.getId() : userId),
+                encode(registration.isUseRegistrationId() ? registration.getId() : userId),
                 encode(sessionKey),
                 encode(challenge),
                 encode(this.service.getIdentifier()),
diff --git a/src/main/java/tiqr/org/model/Registration.java b/src/main/java/tiqr/org/model/Registration.java
index a3ff7b4..63b4ea6 100644
--- a/src/main/java/tiqr/org/model/Registration.java
+++ b/src/main/java/tiqr/org/model/Registration.java
@@ -28,7 +28,7 @@ public class Registration implements Serializable {
     private RegistrationStatus status;
     private Instant created;
     private Instant updated;
-    private boolean usePrimaryIdentifier;
+    private boolean useRegistrationId;
 
     public void validateForInitialEnrollment() {
         validateForPushNotification();