diff --git a/internal/accessor/staff/get_by_email.go b/internal/accessor/staff/get_by_email.go
index aaaea7d..d2d942a 100644
--- a/internal/accessor/staff/get_by_email.go
+++ b/internal/accessor/staff/get_by_email.go
@@ -15,7 +15,7 @@ func (sr *StaffRepository) GetStaffByEmail(email string) (*authdomain.Staff, err
 		return nil, errors.New("email is required")
 	}
 
-	if err := sr.DB.Where("email = ?", email).First(&staff).Error; err != nil {
+	if err := sr.DB.First(&staff, "email = ?", email).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, errors.New("staff not found")
 		}
diff --git a/internal/accessor/staff/get_by_id.go b/internal/accessor/staff/get_by_id.go
index c8bb14e..4c23c15 100644
--- a/internal/accessor/staff/get_by_id.go
+++ b/internal/accessor/staff/get_by_id.go
@@ -14,7 +14,7 @@ func (sr *StaffRepository) GetStaffByID(ID string) (*authdomain.Staff, error) {
 		return nil, errors.New("id is required")
 	}
 
-	if err := sr.DB.Where("id = ? ", ID).First(&staff).Error; err != nil {
+	if err := sr.DB.First(&staff, "id = ? ", ID).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, errors.New("staff not found")
 		}
diff --git a/internal/accessor/subscribeplan/get_default.go b/internal/accessor/subscribeplan/get_default.go
index 5eb8cbf..290f26a 100644
--- a/internal/accessor/subscribeplan/get_default.go
+++ b/internal/accessor/subscribeplan/get_default.go
@@ -9,7 +9,7 @@ import (
 func (s *SubsPlan) GetDefault() (subscribeplandomain.SubscribePlan, error) {
 	var subscribePlan subscribeplandomain.SubscribePlan
 
-	if err := s.DB.Where("code = ?", "basic").First(&subscribePlan).Error; err != nil {
+	if err := s.DB.First(&subscribePlan, "code = ?", "basic").Error; err != nil {
 		s.DB.Create(&subscribeplandomain.SubscribePlan{
 			ID:   uuid.NewString(),
 			Code: "basic",
diff --git a/internal/accessor/user_repository/get_user_by_email.go b/internal/accessor/user_repository/get_user_by_email.go
index 522c395..2239cc5 100644
--- a/internal/accessor/user_repository/get_user_by_email.go
+++ b/internal/accessor/user_repository/get_user_by_email.go
@@ -15,7 +15,7 @@ func (ur *UserRepository) GetUserByEmail(email string) (*authdomain.User, error)
 		return nil, errors.New("email is empty")
 	}
 
-	if err := ur.DB.Where("email = ?", email).First(&user).Error; err != nil {
+	if err := ur.DB.First(&user, "email = ?", email).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, errors.New("user not found")
 		}