diff --git a/storage/user/registation.go b/storage/user/registation.go
index cfc32f1b87a82328891eeb646bf743436ec8416e..4da19b4cd0faf8e83fe22ad2e177afb8d8109897 100644
--- a/storage/user/registation.go
+++ b/storage/user/registation.go
@@ -16,6 +16,7 @@ import (
 )
 
 const currentRegValidationSigVersion = 0
+const registrationTimestampVersion = 0
 const transmissionRegValidationSigKey = "transmissionRegistrationValidationSignature"
 const receptionRegValidationSigKey = "receptionRegistrationValidationSignature"
 const registrationTimestampKey = "registrationTimestamp"
@@ -69,7 +70,7 @@ func (u *User) loadReceptionRegistrationValidationSignature() {
 func (u *User) loadRegistrationTimestamp() {
 	u.rvsMux.Lock()
 	obj, err := u.kv.Get(registrationTimestampKey,
-		currentRegValidationSigVersion)
+		registrationTimestampVersion)
 	if err == nil {
 		tsNano := binary.BigEndian.Uint64(obj.Data)
 		u.registrationTimestamp = time.Unix(0, int64(tsNano))
@@ -153,7 +154,7 @@ func (u *User) SetRegistrationTimestamp(tsNano int64) {
 	}
 
 	err := u.kv.Set(registrationTimestampKey,
-		currentRegValidationSigVersion, obj)
+		registrationTimestampVersion, obj)
 	if err != nil {
 		jww.FATAL.Panicf("Failed to store the reception timestamp: %s", err)
 	}
diff --git a/storage/user/registation_test.go b/storage/user/registation_test.go
index 43dd65241477d7e23bf9204a4d44b711c6133d55..31c6d3d1ee67f4e81fddd4a5822a18d0ad4d7ccf 100644
--- a/storage/user/registation_test.go
+++ b/storage/user/registation_test.go
@@ -164,7 +164,7 @@ func TestUser_GetRegistrationTimestamp(t *testing.T) {
 	}
 
 	// Pull timestamp from kv
-	obj, err := u.kv.Get(registrationTimestampKey, 0)
+	obj, err := u.kv.Get(registrationTimestampKey, registrationTimestampVersion)
 	if err != nil {
 		t.Errorf("Failed to get reg vaildation signature key: %+v", err)
 	}
@@ -213,7 +213,7 @@ func TestUser_loadRegistrationTimestamp(t *testing.T) {
 		Data:      data,
 	}
 	err = kv.Set(registrationTimestampKey,
-		currentRegValidationSigVersion, vo)
+		registrationTimestampVersion, vo)
 	if err != nil {
 		t.Errorf("Failed to set reg validation sig key in kv store: %+v", err)
 	}