1 files changed, 5 insertions, 1 deletions
diff --git a/g10/keygen.c b/g10/keygen.c
index 58642e103..a98ec53f2 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -793,7 +793,11 @@ ask_user_id( int mode )
 		aname = cpr_get("keygen.name",_("Real name: "));
 		trim_spaces(aname);
 		cpr_kill_prompt();
-		if( strpbrk( aname, "<([])>" ) )
+
+		if( opt.allow_freeform_uid )
+		    break;
+
+		if( strpbrk( aname, "<>" ) )
 		    tty_printf(_("Invalid character in name\n"));
 		else if( isdigit(*aname) )
 		    tty_printf(_("Name may not start with a digit\n"));