diff --git a/grpcapi/accounts.go b/grpcapi/accounts.go
index 1a6ac68..18acef9 100644
--- a/grpcapi/accounts.go
+++ b/grpcapi/accounts.go
@@ -38,19 +38,25 @@ func (a Account) ToStorageType() storage.Account {
 }
 
 func (lc LocalAuth) ToStorageType() storage.LocalAuth {
+	emailValidation := storage.Validation{}
+	if lc.EmailValidation != nil {
+		emailValidation.Validated = lc.EmailValidation.Validated
+		emailValidation.ValidationCode = lc.EmailValidation.ValidationCode
+	}
+
+	phoneValidation := storage.Validation{}
+	if lc.PhoneNumberValidation != nil {
+		phoneValidation.Validated = lc.PhoneNumberValidation.Validated
+		phoneValidation.ValidationCode = lc.PhoneNumberValidation.ValidationCode
+	}
+
 	return storage.LocalAuth{
-		Username: lc.Username,
-		Password: lc.Password,
-		Email:    lc.Email,
-		EmailValidation: storage.Validation{
-			Validated:      lc.EmailValidation.Validated,
-			ValidationCode: lc.EmailValidation.ValidationCode,
-		},
-		PhoneNumber: lc.PhoneNumber,
-		PhoneNumberValidation: storage.Validation{
-			Validated:      lc.PhoneNumberValidation.Validated,
-			ValidationCode: lc.PhoneNumberValidation.ValidationCode,
-		},
+		Username:              lc.Username,
+		Password:              lc.Password,
+		Email:                 lc.Email,
+		EmailValidation:       emailValidation,
+		PhoneNumber:           lc.PhoneNumber,
+		PhoneNumberValidation: phoneValidation,
 	}
 }