diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/AcmeResource.java b/acme4j-client/src/main/java/org/shredzone/acme4j/AcmeResource.java
index c0a1c45e..f0897ffb 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/AcmeResource.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/AcmeResource.java
@@ -59,7 +59,6 @@ public abstract class AcmeResource implements Serializable {
      */
     protected void setLocation(URL location) {
         this.location = Objects.requireNonNull(location, "location");
-        session.setKeyIdentifier(this.location.toString());
     }
 
     /**
diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java
index 4ebc5901..420c6f1e 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java
@@ -65,6 +65,7 @@ public class Registration extends AcmeResource {
     protected Registration(Session session, URL location) {
         super(session);
         setLocation(location);
+        session.setKeyIdentifier(location.toString());
     }
 
     /**