diff --git a/release/go/spacemesh/v2alpha1/account.pb.go b/release/go/spacemesh/v2alpha1/account.pb.go
index d99f33f3..75115cd9 100644
--- a/release/go/spacemesh/v2alpha1/account.pb.go
+++ b/release/go/spacemesh/v2alpha1/account.pb.go
@@ -27,9 +27,9 @@ type Account struct {
 	unknownFields protoimpl.UnknownFields
 
 	Address   string        `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`     // account public address
-	Template  string        `protobuf:"bytes,2,opt,name=template,proto3" json:"template,omitempty"`   // account template address
-	Current   *AccountState `protobuf:"bytes,3,opt,name=current,proto3" json:"current,omitempty"`     // current state
-	Projected *AccountState `protobuf:"bytes,4,opt,name=projected,proto3" json:"projected,omitempty"` // projected state (includes pending txs)
+	Current   *AccountState `protobuf:"bytes,2,opt,name=current,proto3" json:"current,omitempty"`     // current state
+	Projected *AccountState `protobuf:"bytes,3,opt,name=projected,proto3" json:"projected,omitempty"` // projected state (includes pending txs)
+	Template  string        `protobuf:"bytes,4,opt,name=template,proto3" json:"template,omitempty"`   // account template address
 }
 
 func (x *Account) Reset() {
@@ -71,13 +71,6 @@ func (x *Account) GetAddress() string {
 	return ""
 }
 
-func (x *Account) GetTemplate() string {
-	if x != nil {
-		return x.Template
-	}
-	return ""
-}
-
 func (x *Account) GetCurrent() *AccountState {
 	if x != nil {
 		return x.Current
@@ -92,6 +85,13 @@ func (x *Account) GetProjected() *AccountState {
 	return nil
 }
 
+func (x *Account) GetTemplate() string {
+	if x != nil {
+		return x.Template
+	}
+	return ""
+}
+
 type AccountState struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -277,17 +277,17 @@ var file_spacemesh_v2alpha1_account_proto_rawDesc = []byte{
 	0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbb, 0x01, 0x0a, 0x07, 0x41, 0x63, 0x63, 0x6f, 0x75,
 	0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1a, 0x0a, 0x08,
-	0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x3a, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x72,
-	0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x41,
-	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x07, 0x63, 0x75, 0x72,
-	0x72, 0x65, 0x6e, 0x74, 0x12, 0x3e, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x65,
-	0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x73, 0x70, 0x61, 0x63, 0x65, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x41, 0x63, 0x63,
-	0x6f, 0x75, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x6a, 0x65,
-	0x63, 0x74, 0x65, 0x64, 0x22, 0x58, 0x0a, 0x0c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53,
+	0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x3a, 0x0a, 0x07,
+	0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68,
+	0x61, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
+	0x07, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x12, 0x3e, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x6a,
+	0x65, 0x63, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31,
+	0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x09, 0x70,
+	0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x6d, 0x70,
+	0x6c, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x65, 0x6d, 0x70,
+	0x6c, 0x61, 0x74, 0x65, 0x22, 0x58, 0x0a, 0x0c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53,
 	0x74, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x18,
 	0x0a, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52,
diff --git a/spacemesh/v2alpha1/account.proto b/spacemesh/v2alpha1/account.proto
index cc7d254e..6a05062e 100644
--- a/spacemesh/v2alpha1/account.proto
+++ b/spacemesh/v2alpha1/account.proto
@@ -7,9 +7,9 @@ package spacemesh.v2alpha1;
 
 message Account {
   string address = 1; // account public address
-  string template = 2; // account template address
-  AccountState current = 3; // current state
-  AccountState projected = 4; // projected state (includes pending txs)
+  AccountState current = 2; // current state
+  AccountState projected = 3; // projected state (includes pending txs)
+  string template = 4; // account template address
 }
 
 message AccountState {