diff --git a/src/client/plex.go b/src/client/plex.go
index af1740a7..c2473469 100644
--- a/src/client/plex.go
+++ b/src/client/plex.go
@@ -250,7 +250,9 @@ func (c *Plex) AddHeader() error {
 		c.Cfg.Creds.Headers = make(map[string]string)
 		c.Cfg.Creds.Headers["X-Plex-Client-Identifier"] = c.Cfg.ClientID
 
-		return nil
+		if c.Cfg.Creds.APIKey == "" { // token comes later from GetAuth
+			return nil
+		}
 	}
 	if c.Cfg.Creds.APIKey != "" {
 		c.Cfg.Creds.Headers["X-Plex-Token"] = c.Cfg.Creds.APIKey
diff --git a/src/web/backend/settings/handlers.go b/src/web/backend/settings/handlers.go
index 246fa87f..42d07c0f 100644
--- a/src/web/backend/settings/handlers.go
+++ b/src/web/backend/settings/handlers.go
@@ -416,7 +416,7 @@ func (s *Settings) HandleWizardStep2(w http.ResponseWriter, r *http.Request) {
 		"PUBLIC_PLAYLIST":       publicPlaylist,
 		"ADMIN_SYSTEM_USERNAME": body.AdminSystemUsername,
 		"ADMIN_SYSTEM_PASSWORD": body.AdminSystemPassword,
-		"ADMIN_SYSTEM_APIKEY":   body.AdminAPIKey,
+		"ADMIN_API_KEY":         body.AdminAPIKey,
 	}
 
 	if err := s.UpdateEnvKeys(updates, web.SampleEnv); err != nil {