diff --git a/internal/action/setup.go b/internal/action/setup.go
index b3d55435b4..21ccffd207 100644
--- a/internal/action/setup.go
+++ b/internal/action/setup.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/fatih/color"
 	"github.com/gopasspw/gopass/internal/action/exit"
@@ -140,6 +141,9 @@ func (s *Action) initGenerateIdentity(ctx context.Context, crypto backend.Crypto
 		if err != nil {
 			return err
 		}
+		if strings.TrimSpace(email) == "" {
+			return fmt.Errorf("⛔️ Please enter a valid email address to proceed")
+		}
 	}
 
 	passphrase := xkcdgen.Random()