diff --git a/cmd/auth.go b/cmd/auth.go
index 30778a3..6c1c1c4 100644
--- a/cmd/auth.go
+++ b/cmd/auth.go
@@ -86,20 +86,13 @@ var authCmd = &cobra.Command{
 		tok, err := conf.Exchange(ctx, code, oauth2.VerifierOption(verifier))
 		cobra.CheckErr(err)
 
-		fmt.Printf("Token: %v\n", tok)
-
 		db, err := storage.New(viper.GetString("database"))
 		cobra.CheckErr(err)
 
 		err = db.SetOAuth2Token(serviceName, tok)
 		cobra.CheckErr(err)
 
-		// oauth2.Token{
-
-		// }
-
-		// client := conf.Client(ctx, tok)
-		// client.Get("...")
+		fmt.Printf("Access token received, you can use %v now.\n\n", serviceName)
 	},
 }
 
diff --git a/cmd/listens.go b/cmd/listens.go
index ce72a87..5defd9d 100644
--- a/cmd/listens.go
+++ b/cmd/listens.go
@@ -54,7 +54,7 @@ var listensCmd = &cobra.Command{
 		auth, err := backends.Authenticate(exportBackend, token, viper.GetViper())
 		cobra.CheckErr(err)
 		if auth {
-			db.SetOAuth2Token(sourceName, token)
+			defer db.SetOAuth2Token(sourceName, token)
 		}
 
 		token, err = db.GetOAuth2Token(targetName)