diff --git a/.env b/.env
index c44cab9..84586cd 100644
--- a/.env
+++ b/.env
@@ -13,5 +13,10 @@ DB_USERNAME=root
 DB_PASSWORD=test123
 DB_NAME=filekeeper
 
+SMTP_HOST=mail.fossy.my.id
+SMTP_PORT=25
+SMTP_USER=test@fossy.my.id
+SMTP_PASSWORD=Test123456
+
 SESSION_NAME=Session
 SESSION_MAX_AGE=604800
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index dfe0a32..03dea1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,7 @@
 /log
 /.idea
 
+.env
+
 *_templ.txt
 *_templ.go
\ No newline at end of file
diff --git a/handler/forgotPassword/forgotPassword.go b/handler/forgotPassword/forgotPassword.go
index f1e42a0..0b5fb77 100644
--- a/handler/forgotPassword/forgotPassword.go
+++ b/handler/forgotPassword/forgotPassword.go
@@ -15,6 +15,7 @@ import (
 	forgotPasswordView "github.com/fossyy/filekeeper/view/forgotPassword"
 	"gorm.io/gorm"
 	"net/http"
+	"strconv"
 	"sync"
 	"time"
 )
@@ -34,7 +35,8 @@ var UserForgotPassword = make(map[string]string)
 func init() {
 	log = logger.Logger()
 	ListForgotPassword = make(map[string]*ForgotPassword)
-	mailServer = email.NewSmtpServer("mail.fossy.my.id", 25, "test@fossy.my.id", "Test123456")
+	smtpPort, _ := strconv.Atoi(utils.Getenv("SMTP_PORT"))
+	mailServer = email.NewSmtpServer(utils.Getenv("SMTP_HOST"), smtpPort, utils.Getenv("SMTP_USER"), utils.Getenv("SMTP_PASSWORD"))
 	ticker := time.NewTicker(time.Minute)
 	go func() {
 		for {
diff --git a/handler/signup/signup.go b/handler/signup/signup.go
index 92cebb6..3229cd8 100644
--- a/handler/signup/signup.go
+++ b/handler/signup/signup.go
@@ -16,6 +16,7 @@ import (
 	"github.com/google/uuid"
 	"gorm.io/gorm"
 	"net/http"
+	"strconv"
 	"sync"
 	"time"
 )
@@ -34,7 +35,8 @@ var VerifyEmail map[string]string
 
 func init() {
 	log = logger.Logger()
-	mailServer = email.NewSmtpServer("mail.fossy.my.id", 25, "test@fossy.my.id", "Test123456")
+	smtpPort, _ := strconv.Atoi(utils.Getenv("SMTP_PORT"))
+	mailServer = email.NewSmtpServer(utils.Getenv("SMTP_HOST"), smtpPort, utils.Getenv("SMTP_USER"), utils.Getenv("SMTP_PASSWORD"))
 	VerifyUser = make(map[string]*UnverifiedUser)
 	VerifyEmail = make(map[string]string)