diff --git a/examples/Client.java b/examples/Client.java
index 44c4cad..2da8cd8 100644
--- a/examples/Client.java
+++ b/examples/Client.java
@@ -342,6 +342,29 @@ public class Client {
                 sslCtx.setDecryptVerifyCb(dvcb);
             }
 
+            /* register public key callbacks, ctx setup is later */
+            if (pkCallbacks == 1) {
+
+                /* ECC */
+                MyEccSignCallback eccSign = new MyEccSignCallback();
+                MyEccVerifyCallback eccVerify = new MyEccVerifyCallback();
+                MyEccSharedSecretCallback eccSharedSecret =
+                    new MyEccSharedSecretCallback();
+                sslCtx.setEccSignCb(eccSign);
+                sslCtx.setEccVerifyCb(eccVerify);
+                sslCtx.setEccSharedSecretCb(eccSharedSecret);
+
+                /* RSA */
+                MyRsaSignCallback rsaSign = new MyRsaSignCallback();
+                MyRsaVerifyCallback rsaVerify = new MyRsaVerifyCallback();
+                MyRsaEncCallback rsaEnc = new MyRsaEncCallback();
+                MyRsaDecCallback rsaDec = new MyRsaDecCallback();
+                sslCtx.setRsaSignCb(rsaSign);
+                sslCtx.setRsaVerifyCb(rsaVerify);
+                sslCtx.setRsaEncCb(rsaEnc);
+                sslCtx.setRsaDecCb(rsaDec);
+            }
+
             if (benchmark != 0) {
                 int times = benchmark;
                 int i = 0;
@@ -452,37 +475,22 @@ public class Client {
             }
 
             if (pkCallbacks == 1) {
-                /* register public key callbacks */
+                /* register public key callback user contexts */
 
                 /* ECC */
-                MyEccSignCallback eccSign = new MyEccSignCallback();
-                MyEccVerifyCallback eccVerify = new MyEccVerifyCallback();
-                MyEccSharedSecretCallback eccSharedSecret =
-                    new MyEccSharedSecretCallback();
                 MyEccSignCtx eccSignCtx = new MyEccSignCtx();
                 MyEccVerifyCtx eccVerifyCtx = new MyEccVerifyCtx();
                 MyEccSharedSecretCtx eccSharedSecretCtx =
                     new MyEccSharedSecretCtx();
-                sslCtx.setEccSignCb(eccSign);
-                sslCtx.setEccVerifyCb(eccVerify);
-                sslCtx.setEccSharedSecretCb(eccSharedSecret);
                 ssl.setEccSignCtx(eccSignCtx);
                 ssl.setEccVerifyCtx(eccVerifyCtx);
                 ssl.setEccSharedSecretCtx(eccSharedSecretCtx);
 
                 /* RSA */
-                MyRsaSignCallback rsaSign = new MyRsaSignCallback();
-                MyRsaVerifyCallback rsaVerify = new MyRsaVerifyCallback();
-                MyRsaEncCallback rsaEnc = new MyRsaEncCallback();
-                MyRsaDecCallback rsaDec = new MyRsaDecCallback();
                 MyRsaSignCtx rsaSignCtx = new MyRsaSignCtx();
                 MyRsaVerifyCtx rsaVerifyCtx = new MyRsaVerifyCtx();
                 MyRsaEncCtx rsaEncCtx = new MyRsaEncCtx();
                 MyRsaDecCtx rsaDecCtx = new MyRsaDecCtx();
-                sslCtx.setRsaSignCb(rsaSign);
-                sslCtx.setRsaVerifyCb(rsaVerify);
-                sslCtx.setRsaEncCb(rsaEnc);
-                sslCtx.setRsaDecCb(rsaDec);
                 ssl.setRsaSignCtx(rsaSignCtx);
                 ssl.setRsaVerifyCtx(rsaVerifyCtx);
                 ssl.setRsaEncCtx(rsaEncCtx);
diff --git a/examples/Server.java b/examples/Server.java
index 5b1a256..eb1ca44 100644
--- a/examples/Server.java
+++ b/examples/Server.java
@@ -362,6 +362,29 @@ public class Server {
                 sslCtx.setDecryptVerifyCb(dvcb);
             }
 
+            /* register public key callbacks, ctx setup later */
+            if (pkCallbacks == 1) {
+
+                /* ECC */
+                MyEccSignCallback eccSign = new MyEccSignCallback();
+                MyEccVerifyCallback eccVerify = new MyEccVerifyCallback();
+                MyEccSharedSecretCallback eccSharedSecret =
+                    new MyEccSharedSecretCallback();
+                sslCtx.setEccSignCb(eccSign);
+                sslCtx.setEccVerifyCb(eccVerify);
+                sslCtx.setEccSharedSecretCb(eccSharedSecret);
+
+                /* RSA */
+                MyRsaSignCallback rsaSign = new MyRsaSignCallback();
+                MyRsaVerifyCallback rsaVerify = new MyRsaVerifyCallback();
+                MyRsaEncCallback rsaEnc = new MyRsaEncCallback();
+                MyRsaDecCallback rsaDec = new MyRsaDecCallback();
+                sslCtx.setRsaSignCb(rsaSign);
+                sslCtx.setRsaVerifyCb(rsaVerify);
+                sslCtx.setRsaEncCb(rsaEnc);
+                sslCtx.setRsaDecCb(rsaDec);
+            }
+
             /* create server socket, later if DTLS */
             if (doDTLS == 0) {
                 serverSocket = new ServerSocket(port);
@@ -484,37 +507,22 @@ public class Server {
                 }
 
                 if (pkCallbacks == 1) {
-                    /* register public key callbacks */
+                    /* register public key callback user contexts */
 
                     /* ECC */
-                    MyEccSignCallback eccSign = new MyEccSignCallback();
-                    MyEccVerifyCallback eccVerify = new MyEccVerifyCallback();
-                    MyEccSharedSecretCallback eccSharedSecret =
-                        new MyEccSharedSecretCallback();
                     MyEccSignCtx eccSignCtx = new MyEccSignCtx();
                     MyEccVerifyCtx eccVerifyCtx = new MyEccVerifyCtx();
                     MyEccSharedSecretCtx eccSharedSecretCtx =
                         new MyEccSharedSecretCtx();
-                    sslCtx.setEccSignCb(eccSign);
-                    sslCtx.setEccVerifyCb(eccVerify);
-                    sslCtx.setEccSharedSecretCb(eccSharedSecret);
                     ssl.setEccSignCtx(eccSignCtx);
                     ssl.setEccVerifyCtx(eccVerifyCtx);
                     ssl.setEccSharedSecretCtx(eccSharedSecretCtx);
 
                     /* RSA */
-                    MyRsaSignCallback rsaSign = new MyRsaSignCallback();
-                    MyRsaVerifyCallback rsaVerify = new MyRsaVerifyCallback();
-                    MyRsaEncCallback rsaEnc = new MyRsaEncCallback();
-                    MyRsaDecCallback rsaDec = new MyRsaDecCallback();
                     MyRsaSignCtx rsaSignCtx = new MyRsaSignCtx();
                     MyRsaVerifyCtx rsaVerifyCtx = new MyRsaVerifyCtx();
                     MyRsaEncCtx rsaEncCtx = new MyRsaEncCtx();
                     MyRsaDecCtx rsaDecCtx = new MyRsaDecCtx();
-                    sslCtx.setRsaSignCb(rsaSign);
-                    sslCtx.setRsaVerifyCb(rsaVerify);
-                    sslCtx.setRsaEncCb(rsaEnc);
-                    sslCtx.setRsaDecCb(rsaDec);
                     ssl.setRsaSignCtx(rsaSignCtx);
                     ssl.setRsaVerifyCtx(rsaVerifyCtx);
                     ssl.setRsaEncCtx(rsaEncCtx);