diff --git a/login.go b/login.go
index a0e6d9a..5ad3cef 100644
--- a/login.go
+++ b/login.go
@@ -5,17 +5,9 @@ import (
 	"encoding/json"
 
 	"github.com/bogosj/tesla"
+	"golang.org/x/oauth2"
 )
 
-func selectDevice(ctx context.Context, devices []tesla.Device) (d tesla.Device, passcode string, err error) {
-	d = devices[0]
-
-	passcode = "000000"
-	if err != nil {
-		return tesla.Device{}, "", err
-	}
-	return d, passcode, nil
-}
 
 func login(ctx context.Context, username string, password string) (string, error) {
 	defer log.PanicSafe()
@@ -23,7 +15,10 @@ func login(ctx context.Context, username string, password string) (string, error
 	log.LogDebug("Creating client for %+v", username)
 	client, err := tesla.NewClient(
 		ctx,
-		tesla.WithMFAHandler(selectDevice),
+		tesla.WithToken(&oauth2.Token{
+			AccessToken: username,
+			RefreshToken: password,
+		}),
 		tesla.WithCredentials(username, password),
 	)
 	log.LogDebug("Created client for %+v", username)