diff --git a/g10/ChangeLog b/g10/ChangeLog
index 1058c576e..63741015a 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-17  Werner Koch  <wk@g10code.com>
+
+	* keygen.c (ask_user_id): Avoid infinite loop in case of invalid
+	data.  Fixes bug#1186.
+
 2010-02-02  Werner Koch  <wk@g10code.com>
 
 	* keyedit.c (keyedit_menu): Change prompt to "gpg".
diff --git a/g10/keygen.c b/g10/keygen.c
index a623252f4..efef372a0 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -2203,7 +2203,7 @@ ask_user_id (int mode, KBNODE keyblock)
 	    if( strlen(ansstr) != 10 )
 		BUG();
 	    if( cpr_enabled() ) {
-		answer = xstrdup(ansstr+6);
+                answer = xstrdup (ansstr + (fail?8:6));
 		answer[1] = 0;
 	    }
 	    else {