diff --git a/README.md b/README.md
index 5ae2bb2bc5..ebc7ec8892 100644
--- a/README.md
+++ b/README.md
@@ -26,13 +26,14 @@ Gopass is a versatile command line based password manager that is being develope
 - **Secure**: Security is hard. We aim to make it as easy as possible while still providing a good level of protection against common adversaries. *Caution*: If your personal threat level is very high, we might not offer a good tool for you.
 - **Extensible**: While Gopass includes a fair amount of useful features, we can't cover every use-case. To support more special use cases we want to provide a clean and simple API to integration gopass into your own binaries.
 
-## Demo
+## Screenshot
 
-[![asciicast](https://asciinema.org/a/172749.png)](https://asciinema.org/a/172749)
+![screenshot](docs/showcase.png)
 
 ## Features
 
-Please see [docs/features.md](https://github.com/gopasspw/gopass/blob/master/docs/features.md) for an extensive list of all features along with several usage examples.
+Please see [docs/features.md](https://github.com/gopasspw/gopass/blob/master/docs/features.md) for an extensive list of all features along with several usage examples. Some examples are available in our
+[example password store](https://github.com/gopasspw/password-store-example).
 
 | **Feature**                 | **State**     | **Description**                                                   |
 | --------------------------- | ------------- | ----------------------------------------------------------------- |
diff --git a/docs/showcase.png b/docs/showcase.png
new file mode 100644
index 0000000000..0b8dfef56c
Binary files /dev/null and b/docs/showcase.png differ
diff --git a/internal/action/setup.go b/internal/action/setup.go
index 23e02a7444..b66d0bcf1f 100644
--- a/internal/action/setup.go
+++ b/internal/action/setup.go
@@ -98,9 +98,13 @@ func (s *Action) initGenerateIdentity(ctx context.Context, crypto backend.Crypto
 
 	passphrase := xkcdgen.Random()
 	pwGenerated := true
-	if bv, err := termio.AskForBool(ctx, "⚠ Do you want to enter a passphrase? (otherwise we generate one for you)", false); err == nil && bv {
+	want, err := termio.AskForBool(ctx, "⚠ Do you want to enter a passphrase? (otherwise we generate one for you)", false)
+	if err != nil {
+		return err
+	}
+	if want {
 		pwGenerated = false
-		sv, err := termio.AskForPassword(ctx, "✍ Please enter your passphrase")
+		sv, err := termio.AskForPassword(ctx, "your new keypair")
 		if err != nil {
 			return errors.Wrapf(err, "Failed to read passphrase")
 		}