diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/QuestionItem.qml b/internal/frontend/bridge-gui/bridge-gui/qml/QuestionItem.qml
index 24170ffe..06731fb9 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/QuestionItem.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/QuestionItem.qml
@@ -102,7 +102,7 @@ Item {
 
                 label: qsTr(root.label)
                 hint: textInput.text.length + "/" + _maxLength
-                placeholderText: mandatory ? qsTr("%1... (min. %2 characters)").arg(root.text).arg(_minLength) : ""
+                placeholderText: mandatory ? qsTr("%1... (min. %2 characters)").arg(root.tips).arg(_minLength) : ""
 
                 function setDefaultValue(defaultValue) {
                     textInput.text = root.type === root._typeOpen ? defaultValue : ""
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Resources/bug_report_flow.json b/internal/frontend/bridge-gui/bridge-gui/qml/Resources/bug_report_flow.json
index 47e157e6..1417eb99 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/Resources/bug_report_flow.json
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/Resources/bug_report_flow.json
@@ -5,30 +5,30 @@
   "data_v1.0.0": {
     "categories": [
       {
-        "name": "I can't receive mail",
-        "questions": [0,1,2,3,4]
+        "name": "I am not receiving messages in my email client",
+        "questions": [0,5,6,4]
       },
       {
-        "name": "I can't send mail",
-        "questions": [0,1,2,3,4]
+        "name": "I am not able to send messages",
+        "questions": [0,2,3,4]
       },
       {
         "name": "Bridge is not starting",
-        "questions": [0,1,2,3]
+        "questions": [0,2,3,4]
       },
       {
-        "name": "Bridge is slow",
-        "questions": [0,1,2,3]
+        "name": "Bridge is running slow",
+        "questions": [0,2,7,4]
       },
       {
-        "name": "None of the above",
+        "name": "Something else",
         "questions": [0,1,2,3]
       }
     ],
     "questions": [
       {
         "id": 0,
-        "text": "What happened?",
+        "text": "What happened? Please also let us know if you received any errors",
         "tips": "Expected behavior",
         "type": "open",
         "mandatory": true,
@@ -39,7 +39,6 @@
         "text": "What did you want or expect to happen?",
         "tips": "Result",
         "type": "open",
-        "mandatory": true,
         "maxChar": 400
       },
       {
@@ -51,15 +50,33 @@
       },
       {
         "id": 3,
-        "text": "Can you reproduce this issue? (If you repeat the actions, the same thing happens.)",
+        "text": "Can you reproduce this issue? (If you repeat the actions, does the same thing happen?)",
         "type": "choice",
-        "answerList": ["Yes", "No", "I don't know"]
+        "answerList": ["Yes", "No"]
       },
       {
         "id": 4,
-        "text": "Can you list the software you are running?",
+        "text": "Can you check the software you are running from the list?",
         "type": "multichoice",
-        "answerList": ["VPN", "Antivirus", "Firewall", "Cache cleaner"]
+        "answerList": ["VPN", "Antivirus", "Firewall", "Cache Cleaner", "None of the above"]
+      },
+      {
+        "id": 5,
+        "text": "Are you missing messages from the email client or not receiving new ones?",
+        "type": "choice",
+        "answerList": ["An old message is missing", "New messages are not arriving"]
+      },
+      {
+        "id": 6,
+        "text": "Can you locate the messages in the web/mobile applications?",
+        "type": "choice",
+        "answerList": ["Yes", "No"]
+      },
+      {
+        "id": 7,
+        "text": "Are you facing one of the below issues?",
+        "type": "multichoice",
+        "answerList": ["Messages arrive with a delay", "Messages are sending slowly", "Bridge is slow to launch", "Bridge is slowing down my computer"]
       }
     ]
   }