diff --git a/g10/keygen.c b/g10/keygen.c
index 22e56de0d..7b8a6cb48 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 {