diff --git a/api/account/account.go b/api/account/account.go
index 2b6277a..45e1776 100644
--- a/api/account/account.go
+++ b/api/account/account.go
@@ -109,6 +109,11 @@ func (a AccountAPI) register(jc jape.Context) {
 		return
 	}
 
+	if len(request.FirstName) == 0 || len(request.LastName) == 0 {
+		_ = jc.Error(account.NewAccountError(account.ErrKeyAccountCreationFailed, nil), http.StatusBadRequest)
+		return
+	}
+
 	user, err := a.accounts.CreateAccount(request.Email, request.Password)
 	if err != nil {
 		_ = jc.Error(err, http.StatusUnauthorized)
diff --git a/db/models/user.go b/db/models/user.go
index bce7caf..925d9c9 100644
--- a/db/models/user.go
+++ b/db/models/user.go
@@ -2,9 +2,10 @@ package models
 
 import (
 	"errors"
+	"time"
+
 	emailverifier "github.com/AfterShip/email-verifier"
 	"gorm.io/gorm"
-	"time"
 )
 
 type User struct {
@@ -26,14 +27,6 @@ type User struct {
 }
 
 func (u *User) BeforeUpdate(tx *gorm.DB) error {
-	if len(u.FirstName) == 0 {
-		return errors.New("first name is empty")
-	}
-
-	if len(u.LastName) == 0 {
-		return errors.New("last name is empty")
-	}
-
 	verify, err := getEmailVerfier().Verify(u.Email)
 
 	if err != nil {