diff --git a/Dockerfile.dev b/Dockerfile.dev
index 8def8850bfd96d51a7f1c72944556ba5823eb648..03526f3e75455e51850f7f1186b2d2b05f140392 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -6,6 +6,9 @@ RUN go install github.com/google/wire/cmd/wire@latest
 RUN go install github.com/swaggo/swag/cmd/swag@latest
 
 COPY . /app
+
+RUN git config --global --add safe.directory /app
+
 WORKDIR /app
 
 EXPOSE 8080
diff --git a/provider/mail/smtp/smtp.go b/provider/mail/smtp/smtp.go
index 40053da847885d83306541305c303d3aed8b0568..cc1d4060a460ed00840c8f52072ee2ee7b20234f 100644
--- a/provider/mail/smtp/smtp.go
+++ b/provider/mail/smtp/smtp.go
@@ -13,11 +13,9 @@ type SmtpMailProvider struct {
 }
 
 func New(env *env.Environment) *SmtpMailProvider {
-	auth := smtp.PlainAuth(
-		env.SmtpIdentity,
+	auth := smtp.CRAMMD5Auth(
 		env.SmtpUsername,
 		env.SmtpPassword,
-		env.SmtpServer,
 	)
 
 	return &SmtpMailProvider{
diff --git a/service/reset/request.go b/service/reset/request.go
index 0e386525cee3b36e95c0734ae3a9016218802068..f3d645f4a08c7f809a117614acde439cca870a08 100644
--- a/service/reset/request.go
+++ b/service/reset/request.go
@@ -56,7 +56,7 @@ func (rs ResetServiceImpl) Request(payload request.RequestRequestPayload) error
 	// Cache Website on Redis, TTL 30 mins
 	rs.CacheRepository.Set(*cache.NewString(*cache.NewKey(rs.RedisPrefixKey+"resetPassword", resetToken), payload.Email, 30))
 
-	// TODO: Send Reset Email
+	// Send Reset Email
 	mailBuilder, err := rs.TemplateWritterBuilder.Get("reset-password.format.html")
 
 	if err != nil {
diff --git a/utils/env/env.go b/utils/env/env.go
index 2fbe3b6f3738024d507cfbbe09497722e65e9b14..3e25dd23138c7d6ad316085aec015c2d3f88259d 100644
--- a/utils/env/env.go
+++ b/utils/env/env.go
@@ -38,7 +38,7 @@ type Environment struct {
 	SmtpPort     int    `env:"SMTP_PORT" envDefault:"25"`
 
 	FrontendBaseURL   string `env:"FE_BASE_URL"`
-	ResetPasswordPath string `env:"RESET_PASSWORD_PATH" envDefault:"/reset"`
+	ResetPasswordPath string `env:"RESET_PASSWORD_PATH" envDefault:"/resetPassword"`
 
 	EmailVerificationPath          string `env:"EMAIL_VERIFICATION_PATH" envDefault:"/verification"`
 	EmailVerificationMaxRetry      int64  `env:"EMAIL_VERIFICATION_MAX_RETRY" envDefault:"5"`
diff --git a/utils/res/data/reset-password.format.html b/utils/res/data/reset-password.format.html
index 80ec4d4f8b7de170e4d8388e23008efc4449cb19..16ea4415ab2c267cbc04ca806a87cbcc81ead636 100644
--- a/utils/res/data/reset-password.format.html
+++ b/utils/res/data/reset-password.format.html
@@ -248,7 +248,7 @@
                                                 <td
                                                   style="line-height: 24px; font-size: 16px; border-radius: 6px; margin: 0;"
                                                   align="center" bgcolor="#0d6efd">
-                                                  <a href="{{ .BaseUrl }}/?token={{ .Token }}" target="_blank"
+                                                  <a href="{{ .BaseUrl }}/{{ .Token }}" target="_blank"
                                                     style="color: #ffffff; font-size: 16px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; border-radius: 6px; line-height: 20px; display: block; font-weight: normal; white-space: nowrap; background-color: #0d6efd; padding: 8px 12px; border: 1px solid #0d6efd;">Reset
                                                     Password</a>
                                                 </td>