diff --git a/pkg/login/login.go b/pkg/login/login.go
index 6c960200f..132061494 100644
--- a/pkg/login/login.go
+++ b/pkg/login/login.go
@@ -106,11 +106,14 @@ func createSecret(ctx context.Context, c client.Client, app *apiv1.App, secretNa
 	data := map[string][]byte{}
 	promptOrder, _ := app.Status.AppSpec.Secrets[secretName].Params.GetData()["promptOrder"].([]string)
 	for _, key := range promptOrder {
-		if _, ok := app.Status.AppSpec.Secrets[secretName].Data[key]; ok {
-			value, err := prompt.Password(key)
+		if def, ok := app.Status.AppSpec.Secrets[secretName].Data[key]; ok {
+			value, err := prompt.Password(fmt.Sprintf("%s (default: %s)", key, def))
 			if err != nil {
 				return err
 			}
+			if len(value) == 0 {
+				value = []byte(def)
+			}
 			data[key] = value
 			asked[key] = struct{}{}
 		}
@@ -119,10 +122,14 @@ func createSecret(ctx context.Context, c client.Client, app *apiv1.App, secretNa
 		if _, asked := asked[key]; asked {
 			continue
 		}
-		value, err := prompt.Password(key)
+		def := app.Status.AppSpec.Secrets[secretName].Data[key]
+		value, err := prompt.Password(fmt.Sprintf("%s (default: %s)", key, def))
 		if err != nil {
 			return err
 		}
+		if len(value) == 0 {
+			value = []byte(def)
+		}
 		data[key] = value
 	}