diff --git a/proto/osmosis/smartaccount/v1beta1/query.proto b/proto/osmosis/smartaccount/v1beta1/query.proto
index d8edb9b3f32..74ab0d7b527 100644
--- a/proto/osmosis/smartaccount/v1beta1/query.proto
+++ b/proto/osmosis/smartaccount/v1beta1/query.proto
@@ -49,7 +49,7 @@ message GetAuthenticatorsResponse {
 // MsgGetAuthenticatorRequest defines the Msg/GetAuthenticator request type.
 message GetAuthenticatorRequest {
   string account = 1;
-  string authenticator_id = 2;
+  uint64 authenticator_id = 2;
 }
 
 // MsgGetAuthenticatorResponse defines the Msg/GetAuthenticator response type.
diff --git a/x/smart-account/types/query.pb.go b/x/smart-account/types/query.pb.go
index ca8c7270952..bff97868e15 100644
--- a/x/smart-account/types/query.pb.go
+++ b/x/smart-account/types/query.pb.go
@@ -206,7 +206,7 @@ func (m *GetAuthenticatorsResponse) GetAccountAuthenticators() []*AccountAuthent
 // MsgGetAuthenticatorRequest defines the Msg/GetAuthenticator request type.
 type GetAuthenticatorRequest struct {
 	Account         string `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"`
-	AuthenticatorId string `protobuf:"bytes,2,opt,name=authenticator_id,json=authenticatorId,proto3" json:"authenticator_id,omitempty"`
+	AuthenticatorId uint64 `protobuf:"varint,2,opt,name=authenticator_id,json=authenticatorId,proto3" json:"authenticator_id,omitempty"`
 }
 
 func (m *GetAuthenticatorRequest) Reset()         { *m = GetAuthenticatorRequest{} }
@@ -249,11 +249,11 @@ func (m *GetAuthenticatorRequest) GetAccount() string {
 	return ""
 }
 
-func (m *GetAuthenticatorRequest) GetAuthenticatorId() string {
+func (m *GetAuthenticatorRequest) GetAuthenticatorId() uint64 {
 	if m != nil {
 		return m.AuthenticatorId
 	}
-	return ""
+	return 0
 }
 
 // MsgGetAuthenticatorResponse defines the Msg/GetAuthenticator response type.
@@ -315,40 +315,40 @@ func init() {
 }
 
 var fileDescriptor_aab2e1fc442f3cc3 = []byte{
-	// 517 bytes of a gzipped FileDescriptorProto
+	// 519 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x41, 0x6f, 0xd3, 0x30,
-	0x14, 0xae, 0xc7, 0x28, 0xc2, 0x3b, 0x30, 0x4c, 0x07, 0xa1, 0xaa, 0xc2, 0x14, 0xed, 0xd0, 0x21,
-	0x2d, 0x5e, 0xc3, 0x18, 0xe2, 0xc6, 0x7a, 0x01, 0x6e, 0x50, 0x4e, 0x70, 0x60, 0x72, 0x52, 0x2b,
+	0x14, 0xae, 0x47, 0x29, 0xc2, 0x3b, 0x30, 0x4c, 0x07, 0xa1, 0xaa, 0x42, 0x15, 0xed, 0xd0, 0x21,
+	0x2d, 0x5e, 0xc3, 0x18, 0xe2, 0xc6, 0x7a, 0x01, 0x6e, 0x10, 0x4e, 0x70, 0x60, 0x72, 0x52, 0x2b,
 	0xb3, 0xd4, 0xc4, 0x59, 0xec, 0x4c, 0x4c, 0xd3, 0x2e, 0x20, 0x71, 0x46, 0xda, 0xbf, 0xe0, 0x37,
-	0xf0, 0x03, 0x26, 0x71, 0x99, 0xc4, 0x85, 0x13, 0x42, 0x2d, 0x3f, 0x04, 0xcd, 0x76, 0x03, 0x69,
-	0x43, 0x58, 0x76, 0xab, 0x5f, 0xbf, 0xef, 0x7d, 0xdf, 0xf7, 0xde, 0x53, 0x60, 0x97, 0x8b, 0x88,
-	0x0b, 0x26, 0xb0, 0x88, 0x48, 0x2a, 0x49, 0x10, 0xf0, 0x2c, 0x96, 0xf8, 0xa0, 0xe7, 0x53, 0x49,
-	0x7a, 0x78, 0x3f, 0xa3, 0xe9, 0xa1, 0x9b, 0xa4, 0x5c, 0x72, 0xd4, 0x31, 0x48, 0xf7, 0x6f, 0xa4,
-	0x6b, 0x90, 0xed, 0x56, 0xc8, 0x43, 0xae, 0x80, 0xf8, 0xfc, 0x97, 0xe6, 0xb4, 0x3b, 0x21, 0xe7,
-	0xe1, 0x88, 0x62, 0x92, 0x30, 0x4c, 0xe2, 0x98, 0x4b, 0x22, 0x19, 0x8f, 0x85, 0xf9, 0xf7, 0x7e,
-	0xa0, 0x5a, 0x62, 0x9f, 0x08, 0xaa, 0xa5, 0x72, 0xe1, 0x84, 0x84, 0x2c, 0x56, 0x60, 0x83, 0x5d,
-	0xaf, 0xf4, 0x99, 0x90, 0x94, 0x44, 0xe2, 0x42, 0xd0, 0x88, 0x0f, 0xe9, 0xc8, 0x40, 0x9d, 0x16,
-	0x44, 0x2f, 0xcf, 0x75, 0x5f, 0x28, 0xfe, 0x80, 0xee, 0x67, 0x54, 0x48, 0xe7, 0x35, 0xbc, 0x55,
-	0xa8, 0x8a, 0x84, 0xc7, 0x82, 0xa2, 0x3e, 0x6c, 0x6a, 0x1d, 0x0b, 0xac, 0x82, 0xee, 0x92, 0xb7,
-	0xe6, 0x56, 0x4d, 0xc4, 0xd5, 0xec, 0xfe, 0xe2, 0xe9, 0x8f, 0x7b, 0x8d, 0x81, 0x61, 0x3a, 0x5b,
-	0xd0, 0x7a, 0x4a, 0xe5, 0x4e, 0x26, 0xf7, 0x68, 0x2c, 0x59, 0x40, 0x24, 0x4f, 0xa7, 0xb2, 0xc8,
-	0x82, 0xd7, 0x4c, 0x0f, 0x25, 0x70, 0x7d, 0x30, 0x7d, 0x3a, 0x1f, 0x01, 0xbc, 0x5b, 0x42, 0x33,
-	0xbe, 0x18, 0xbc, 0x6d, 0x80, 0xbb, 0xa4, 0x80, 0xb0, 0xc0, 0xea, 0x95, 0xee, 0x92, 0xe7, 0x55,
-	0xfb, 0xdc, 0xd1, 0xef, 0x42, 0xf3, 0xc1, 0x0a, 0x29, 0xa9, 0x0a, 0xe7, 0x2d, 0xbc, 0x33, 0xeb,
-	0xe3, 0xbf, 0xee, 0xd1, 0x3a, 0x5c, 0x2e, 0xf8, 0xda, 0x65, 0x43, 0x6b, 0x41, 0x41, 0x6e, 0x14,
-	0xea, 0xcf, 0x87, 0xce, 0x07, 0x30, 0x3f, 0x9f, 0x3c, 0x67, 0x08, 0x57, 0x4a, 0x73, 0x9a, 0x75,
-	0x5c, 0x26, 0x66, 0xab, 0x2c, 0xa6, 0xf7, 0x79, 0x11, 0x5e, 0x55, 0x07, 0x80, 0x4e, 0x00, 0x6c,
-	0xea, 0x3d, 0xa2, 0xcd, 0xea, 0xf6, 0xf3, 0x67, 0xd4, 0xee, 0xd5, 0x60, 0xe8, 0x88, 0xce, 0xda,
-	0xfb, 0x6f, 0xbf, 0x4e, 0x16, 0x6c, 0xd4, 0xc1, 0xa5, 0x37, 0xac, 0x8f, 0x08, 0x7d, 0x05, 0x70,
-	0x79, 0x76, 0x4a, 0xe8, 0x61, 0xb5, 0xda, 0x3f, 0xd6, 0xd6, 0xde, 0xae, 0x4b, 0x33, 0x4e, 0x9f,
-	0x29, 0xa7, 0x7d, 0xf4, 0xa4, 0xdc, 0x69, 0x61, 0x41, 0xf8, 0xc8, 0x94, 0x8f, 0xf1, 0xd1, 0xec,
-	0x25, 0x1c, 0xa3, 0x2f, 0x00, 0xde, 0x9c, 0x3b, 0x6e, 0x54, 0xd3, 0x57, 0x3e, 0xf4, 0x47, 0xb5,
-	0x79, 0x26, 0xd0, 0xb6, 0x0a, 0xb4, 0x89, 0xdc, 0x0b, 0x04, 0x12, 0x7f, 0x12, 0xf5, 0x5f, 0x9d,
-	0x8e, 0x6d, 0x70, 0x36, 0xb6, 0xc1, 0xcf, 0xb1, 0x0d, 0x3e, 0x4d, 0xec, 0xc6, 0xd9, 0xc4, 0x6e,
-	0x7c, 0x9f, 0xd8, 0x8d, 0x37, 0x8f, 0x43, 0x26, 0xf7, 0x32, 0xdf, 0x0d, 0x78, 0x34, 0xed, 0xb9,
-	0x31, 0x22, 0xbe, 0xc8, 0x05, 0x0e, 0xbc, 0x2d, 0xfc, 0x4e, 0xcb, 0x6c, 0x4c, 0x75, 0xe4, 0x61,
-	0x42, 0x85, 0xdf, 0x54, 0x9f, 0xa7, 0x07, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf3, 0x62, 0xa5,
-	0x11, 0x9e, 0x05, 0x00, 0x00,
+	0xf0, 0x03, 0x26, 0x71, 0x99, 0xc4, 0x85, 0x13, 0x42, 0x2d, 0x3f, 0x04, 0xcd, 0x76, 0x0b, 0x69,
+	0x43, 0x58, 0x77, 0xab, 0x5f, 0xbf, 0xef, 0x7d, 0xdf, 0xf7, 0xde, 0x53, 0x60, 0x97, 0x8b, 0x98,
+	0x0b, 0x26, 0xb0, 0x88, 0x49, 0x26, 0x49, 0x18, 0xf2, 0x3c, 0x91, 0xf8, 0xa0, 0x17, 0x50, 0x49,
+	0x7a, 0x78, 0x3f, 0xa7, 0xd9, 0xa1, 0x9b, 0x66, 0x5c, 0x72, 0xd4, 0x36, 0x48, 0xf7, 0x6f, 0xa4,
+	0x6b, 0x90, 0xad, 0x66, 0xc4, 0x23, 0xae, 0x80, 0xf8, 0xfc, 0x97, 0xe6, 0xb4, 0xda, 0x11, 0xe7,
+	0xd1, 0x90, 0x62, 0x92, 0x32, 0x4c, 0x92, 0x84, 0x4b, 0x22, 0x19, 0x4f, 0x84, 0xf9, 0xf7, 0x7e,
+	0xa8, 0x5a, 0xe2, 0x80, 0x08, 0xaa, 0xa5, 0xa6, 0xc2, 0x29, 0x89, 0x58, 0xa2, 0xc0, 0x06, 0xbb,
+	0x5e, 0xe9, 0x33, 0x25, 0x19, 0x89, 0xc5, 0x85, 0xa0, 0x31, 0x1f, 0xd0, 0xa1, 0x81, 0x3a, 0x4d,
+	0x88, 0x5e, 0x9e, 0xeb, 0xbe, 0x50, 0x7c, 0x9f, 0xee, 0xe7, 0x54, 0x48, 0xe7, 0x35, 0xbc, 0x55,
+	0xa8, 0x8a, 0x94, 0x27, 0x82, 0xa2, 0x3e, 0x6c, 0x68, 0x1d, 0x0b, 0x74, 0x40, 0x77, 0xd9, 0x5b,
+	0x73, 0xab, 0x26, 0xe2, 0x6a, 0x76, 0xbf, 0x7e, 0xfa, 0xe3, 0x5e, 0xcd, 0x37, 0x4c, 0x67, 0x0b,
+	0x5a, 0x4f, 0xa9, 0xdc, 0xc9, 0xe5, 0x1e, 0x4d, 0x24, 0x0b, 0x89, 0xe4, 0xd9, 0x44, 0x16, 0x59,
+	0xf0, 0x9a, 0xe9, 0xa1, 0x04, 0xae, 0xfb, 0x93, 0xa7, 0xf3, 0x11, 0xc0, 0xbb, 0x25, 0x34, 0xe3,
+	0x8b, 0xc1, 0xdb, 0x06, 0xb8, 0x4b, 0x0a, 0x08, 0x0b, 0x74, 0xae, 0x74, 0x97, 0x3d, 0xaf, 0xda,
+	0xe7, 0x8e, 0x7e, 0x17, 0x9a, 0xfb, 0xab, 0xa4, 0xa4, 0x2a, 0x9c, 0xb7, 0xf0, 0xce, 0xac, 0x8f,
+	0xff, 0xba, 0x47, 0xeb, 0x70, 0xa5, 0xe0, 0x6b, 0x97, 0x0d, 0xac, 0xa5, 0x0e, 0xe8, 0xd6, 0xfd,
+	0x1b, 0x85, 0xfa, 0xf3, 0x81, 0xf3, 0x01, 0xcc, 0xcf, 0x67, 0x9a, 0x33, 0x82, 0xab, 0xa5, 0x39,
+	0xcd, 0x3a, 0x2e, 0x13, 0xb3, 0x59, 0x16, 0xd3, 0xfb, 0x5c, 0x87, 0x57, 0xd5, 0x01, 0xa0, 0x13,
+	0x00, 0x1b, 0x7a, 0x8f, 0x68, 0xb3, 0xba, 0xfd, 0xfc, 0x19, 0xb5, 0x7a, 0x0b, 0x30, 0x74, 0x44,
+	0x67, 0xed, 0xfd, 0xb7, 0x5f, 0x27, 0x4b, 0x36, 0x6a, 0xe3, 0xd2, 0x1b, 0xd6, 0x47, 0x84, 0xbe,
+	0x02, 0xb8, 0x32, 0x3b, 0x25, 0xf4, 0xb0, 0x5a, 0xed, 0x1f, 0x6b, 0x6b, 0x6d, 0x2f, 0x4a, 0x33,
+	0x4e, 0x9f, 0x29, 0xa7, 0x7d, 0xf4, 0xa4, 0xdc, 0x69, 0x61, 0x41, 0xf8, 0xc8, 0x94, 0x8f, 0xf1,
+	0xd1, 0xec, 0x25, 0x1c, 0xa3, 0x2f, 0x00, 0xde, 0x9c, 0x3b, 0x6e, 0xb4, 0xa0, 0xaf, 0xe9, 0xd0,
+	0x1f, 0x2d, 0xcc, 0x33, 0x81, 0xb6, 0x55, 0xa0, 0x4d, 0xe4, 0x5e, 0x20, 0x90, 0xf8, 0x93, 0xa8,
+	0xff, 0xea, 0x74, 0x64, 0x83, 0xb3, 0x91, 0x0d, 0x7e, 0x8e, 0x6c, 0xf0, 0x69, 0x6c, 0xd7, 0xce,
+	0xc6, 0x76, 0xed, 0xfb, 0xd8, 0xae, 0xbd, 0x79, 0x1c, 0x31, 0xb9, 0x97, 0x07, 0x6e, 0xc8, 0xe3,
+	0x49, 0xcf, 0x8d, 0x21, 0x09, 0xc4, 0x54, 0xe0, 0xc0, 0xdb, 0xc2, 0xef, 0xb4, 0xcc, 0xc6, 0x44,
+	0x47, 0x1e, 0xa6, 0x54, 0x04, 0x0d, 0xf5, 0x79, 0x7a, 0xf0, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x9a,
+	0x94, 0x72, 0xfa, 0x9e, 0x05, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -648,12 +648,10 @@ func (m *GetAuthenticatorRequest) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	_ = i
 	var l int
 	_ = l
-	if len(m.AuthenticatorId) > 0 {
-		i -= len(m.AuthenticatorId)
-		copy(dAtA[i:], m.AuthenticatorId)
-		i = encodeVarintQuery(dAtA, i, uint64(len(m.AuthenticatorId)))
+	if m.AuthenticatorId != 0 {
+		i = encodeVarintQuery(dAtA, i, uint64(m.AuthenticatorId))
 		i--
-		dAtA[i] = 0x12
+		dAtA[i] = 0x10
 	}
 	if len(m.Account) > 0 {
 		i -= len(m.Account)
@@ -769,9 +767,8 @@ func (m *GetAuthenticatorRequest) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovQuery(uint64(l))
 	}
-	l = len(m.AuthenticatorId)
-	if l > 0 {
-		n += 1 + l + sovQuery(uint64(l))
+	if m.AuthenticatorId != 0 {
+		n += 1 + sovQuery(uint64(m.AuthenticatorId))
 	}
 	return n
 }
@@ -1156,10 +1153,10 @@ func (m *GetAuthenticatorRequest) Unmarshal(dAtA []byte) error {
 			m.Account = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		case 2:
-			if wireType != 2 {
+			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field AuthenticatorId", wireType)
 			}
-			var stringLen uint64
+			m.AuthenticatorId = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowQuery
@@ -1169,24 +1166,11 @@ func (m *GetAuthenticatorRequest) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
+				m.AuthenticatorId |= uint64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthQuery
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthQuery
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.AuthenticatorId = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])
diff --git a/x/smart-account/types/query.pb.gw.go b/x/smart-account/types/query.pb.gw.go
index 8fc76b5184a..9f9d6b207dc 100644
--- a/x/smart-account/types/query.pb.gw.go
+++ b/x/smart-account/types/query.pb.gw.go
@@ -78,7 +78,7 @@ func request_Query_GetAuthenticator_0(ctx context.Context, marshaler runtime.Mar
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "authenticator_id")
 	}
 
-	protoReq.AuthenticatorId, err = runtime.String(val)
+	protoReq.AuthenticatorId, err = runtime.Uint64(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "authenticator_id", err)
@@ -116,7 +116,7 @@ func local_request_Query_GetAuthenticator_0(ctx context.Context, marshaler runti
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "authenticator_id")
 	}
 
-	protoReq.AuthenticatorId, err = runtime.String(val)
+	protoReq.AuthenticatorId, err = runtime.Uint64(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "authenticator_id", err)