diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml
index 6acdd4f636a350b95db67acc7de0167061d10755..8abb7dbcf6cbb6e03fa698b8adb5d5ace69c2033 100644
--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml
+++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml
@@ -65,9 +65,16 @@ if len(result) != 1:\n
   return context.Base_redirect(\'login_form\', keep_items = dict(portal_status_message=portal_status_message ))\n
 \n
 person = result[0]\n
+\n
+#If any question, we can create directly the credential recovery\n
+question_free_text = person.getDefaultCredentialQuestionQuestionFreeText()\n
+question_title = person.getDefaultCredentialQuestionQuestionTitle()\n
+if not (question_free_text or question_title):\n
+  return context.ERP5Site_newCredentialRecovery(reference=reference)\n
+\n
 return context.Base_redirect(\'ERP5Site_newCredentialRecoveryDialog\', keep_items = \\\n
-dict(default_credential_question_question_free_text=person.getDefaultCredentialQuestionQuestionFreeText(),\n
-     default_credential_question_question_title=person.getDefaultCredentialQuestionQuestionTitle(),\n
+dict(default_credential_question_question_free_text=question_free_text,\n
+     default_credential_question_question_title=question_title,\n
      reference=reference))\n
 </string> </value>
         </item>
diff --git a/bt5/erp5_credential/bt/revision b/bt5/erp5_credential/bt/revision
index f9c94c8318066ba562fd1ce1e14753071396ea54..95738485793d46fac341b01b1f8f9468b4df0dd1 100644
--- a/bt5/erp5_credential/bt/revision
+++ b/bt5/erp5_credential/bt/revision
@@ -1 +1 @@
-325
\ No newline at end of file
+326
\ No newline at end of file