diff --git a/cmd/login.go b/cmd/login.go
index 361f4b3..de9a721 100644
--- a/cmd/login.go
+++ b/cmd/login.go
@@ -65,7 +65,7 @@ var loginCmd = &cobra.Command{
 }
 
 func executeLogin(args []string, getHome func() (string, pkg.ConfFiles, error), usageFunc func() error) (int, error) {
-	if len(args) == 0 {
+	if clientJSON == "" && clientID == "" && clientName == "" && clientSecret == "" && authToken == "" {
 		if err := usageFunc(); err != nil {
 			return CriticalError, fmt.Errorf("cannot show usage %v", err)
 		}
@@ -163,6 +163,6 @@ func makeConf(confDir, confFile, content string) error {
 	if err != nil {
 		return fmt.Errorf("error finishing file")
 	}
-	fmt.Println("Login information saved")
+	fmt.Printf("Login information saved at %v\n", confFile)
 	return nil
 }
diff --git a/cmd/login_test.go b/cmd/login_test.go
index ce64fe0..5712bdf 100644
--- a/cmd/login_test.go
+++ b/cmd/login_test.go
@@ -259,11 +259,14 @@ func TestLoginArgsMissingSecret(t *testing.T) {
 }
 
 func TestLoginHomeError(t *testing.T) {
-	exitCode, err := executeLogin([]string{"--json", clientJSON}, func() (string, pkg.ConfFiles, error) {
+	clientJSON = "invalidjson"
+	defer func() { clientJSON = "" }()
+	exitCode, err := executeLogin([]string{}, func() (string, pkg.ConfFiles, error) {
 		return "", pkg.ConfFiles{}, fmt.Errorf("big error")
 	}, usageFunc)
 	if err == nil {
-		t.Error("expected error")
+		t.Logf("expected error there was none and exit code was %v", exitCode)
+		t.FailNow()
 	}
 	expected := "big error"
 	if err.Error() != expected {