diff --git a/config_example.yaml b/config_example.yaml
index a107465..e96073e 100644
--- a/config_example.yaml
+++ b/config_example.yaml
@@ -10,6 +10,8 @@ parser:
 
 steam:
   username: steamuser
+  # Password needs to be provided only until a login_key is obtained, can be empty after
+  password: steampassword
   api_key: apikey
   rate_per_sec: 1
 
diff --git a/csgo/demo_loader.go b/csgo/demo_loader.go
index cbdafd6..0112789 100644
--- a/csgo/demo_loader.go
+++ b/csgo/demo_loader.go
@@ -127,12 +127,12 @@ func (d *DemoMatchLoader) connectToSteam() error {
 	return nil
 }
 
-func (d *DemoMatchLoader) Setup(username string, authCode string) error {
+func (d *DemoMatchLoader) Setup(username string, password string, authCode string) error {
 	d.steamLogin = new(steam.LogOnDetails)
 	d.steamLogin.Username = username
-	d.steamLogin.Password = os.Getenv("STEAM_PASSWORD")
-	d.steamLogin.ShouldRememberPassword = true
+	d.steamLogin.Password = password
 	d.steamLogin.AuthCode = authCode
+	d.steamLogin.ShouldRememberPassword = true
 
 	if _, err := os.Stat(SENTRYFILE); err == nil {
 		hash, err := ioutil.ReadFile(SENTRYFILE)
diff --git a/main.go b/main.go
index 4c9958f..fa632ea 100644
--- a/main.go
+++ b/main.go
@@ -395,7 +395,7 @@ func main() {
 
 	rL = ratelimit.New(conf.Steam.RatePerSecond)
 	// setup GC
-	err = demoLoader.Setup(conf.Steam.Username, *authCodeFlag)
+	err = demoLoader.Setup(conf.Steam.Username, *authCodeFlag, conf.Steam.Password)
 	if err != nil {
 		log.Fatalf("Unbale to setup DemoLoader: %v", err)
 	}
diff --git a/utils/utils.go b/utils/utils.go
index 86771fd..5fb840c 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -35,6 +35,7 @@ type Conf struct {
 	}
 	Steam struct {
 		Username      string
+		Password      string
 		APIKey        string `yaml:"api_key"`
 		RatePerSecond int    `yaml:"rate_per_sec"`
 	}