diff --git a/cmd/api/main.go b/cmd/api/main.go
index 6a565aa..829b395 100644
--- a/cmd/api/main.go
+++ b/cmd/api/main.go
@@ -75,13 +75,22 @@ func main() {
 
 	// Initialize email service
 	var emailService *services.EmailService
+	log.Info().
+		Str("email_host", cfg.Email.Host).
+		Str("email_user", cfg.Email.User).
+		Str("email_from", cfg.Email.From).
+		Int("email_port", cfg.Email.Port).
+		Msg("Email config loaded")
 	if cfg.Email.Host != "" && cfg.Email.User != "" {
 		emailService = services.NewEmailService(&cfg.Email)
 		log.Info().
 			Str("host", cfg.Email.Host).
 			Msg("Email service initialized")
 	} else {
-		log.Warn().Msg("Email service not configured - emails will not be sent")
+		log.Warn().
+			Str("host", cfg.Email.Host).
+			Str("user", cfg.Email.User).
+			Msg("Email service not configured - emails will not be sent")
 	}
 
 	// Setup router with dependencies
diff --git a/internal/config/config.go b/internal/config/config.go
index 52eff7d..4849fa6 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -209,6 +209,8 @@ func setDefaults() {
 	viper.SetDefault("EMAIL_HOST", "smtp.gmail.com")
 	viper.SetDefault("EMAIL_PORT", 587)
 	viper.SetDefault("EMAIL_USE_TLS", true)
+	viper.SetDefault("EMAIL_HOST_USER", "")
+	viper.SetDefault("EMAIL_HOST_PASSWORD", "")
 	viper.SetDefault("DEFAULT_FROM_EMAIL", "MyCrib <noreply@mycrib.com>")
 
 	// Push notification defaults