diff --git a/app/lib/constants.js b/app/lib/constants.js
index 45c1c8982cd8f7ebb348ae05792fad0847ae2b29..7d5b2ee40a71c001f47f2aab6ea7335327f31c2e 100644
--- a/app/lib/constants.js
+++ b/app/lib/constants.js
@@ -49,6 +49,12 @@ module.exports = {
     SENDER: exact(PUBKEY),
     SOURCE: exact(INTEGER + ":(T|D|F):" + FINGERPRINT),
     TARGET: exact(PUBKEY + ":" + POSITIVE_INT)
+  },
+
+  setUDID2Format: function () {
+    module.exports.USER_ID = module.exports.UDID2_FORMAT;
+    module.exports.CERT.SELF.UID = exact("UID:" + UDID2);
+    module.exports.IDENTITY.INLINE = exact(PUBKEY + ":" + SIGNATURE + ":" + TIMESTAMP + ":" + UDID2);
   }
 };
 
diff --git a/bin/ucoind b/bin/ucoind
index cade96fc29d42412ef0da45d021dd79b482746bf..7e8cf6b5b04f1e29f5161f600656bc5e64510b2c 100755
--- a/bin/ucoind
+++ b/bin/ucoind
@@ -416,7 +416,7 @@ program
 
     if (conf.udid2) {
       // UserID must match udid2 format
-      constants.USER_ID = constants.UDID2_FORMAT;
+      constants.setUDID2Format();
     }
 
     // server