diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po
index 6e949924..769825bd 100644
--- a/resources/lang/de_DE/default.po
+++ b/resources/lang/de_DE/default.po
@@ -2970,6 +2970,9 @@ msgstr "Trennen"
 msgid "faq.faq"
 msgstr "FAQ"
 
+msgid "faq.questions_link"
+msgstr "Wenn deine Frage hier nicht beantwortet wurde, <a href=\"%s\">frag den Himmel</a>."
+
 msgid "faq.edit"
 msgstr "FAQ Eintrag bearbeiten"
 
@@ -2985,8 +2988,11 @@ msgstr "Antwort"
 msgid "question.questions"
 msgstr "Fragen"
 
+msgid "question.faq_link"
+msgstr "Hast du eine generelle Frage? Vielleicht ist diese schon in den <a href=\"%s\">FAQ</a> beantwortet."
+
 msgid "question.add"
-msgstr "Fragen"
+msgstr "Stelle eine Frage"
 
 msgid "question.edit"
 msgstr "Frage bearbeiten"
diff --git a/resources/lang/en_US/default.po b/resources/lang/en_US/default.po
index 81f4a4e7..76f21486 100644
--- a/resources/lang/en_US/default.po
+++ b/resources/lang/en_US/default.po
@@ -240,6 +240,9 @@ msgstr "Disconnect"
 msgid "faq.faq"
 msgstr "FAQ"
 
+msgid "faq.questions_link"
+msgstr "If you don't find an answer, you can <a href=\"%s\">ask the heaven</a>."
+
 msgid "faq.edit"
 msgstr "Edit FAQ entry"
 
@@ -255,8 +258,11 @@ msgstr "Answer"
 msgid "question.questions"
 msgstr "Questions"
 
+msgid "question.faq_link"
+msgstr "For general questions, have a look at our <a href=\"%s\">FAQ</a>."
+
 msgid "question.add"
-msgstr "Ask"
+msgstr "Ask a question"
 
 msgid "question.edit"
 msgstr "Edit question"
diff --git a/resources/views/pages/faq/overview.twig b/resources/views/pages/faq/overview.twig
index e3762c09..ea89d43b 100644
--- a/resources/views/pages/faq/overview.twig
+++ b/resources/views/pages/faq/overview.twig
@@ -1,5 +1,6 @@
 {% extends 'layouts/app.twig' %}
 {% import 'macros/base.twig' as m %}
+{% import 'macros/form.twig' as f %}
 
 {% block title %}
     {{ __('faq.faq') }}
@@ -18,6 +19,12 @@
         {% include 'layouts/parts/messages.twig' %}
 
         <div class="row">
+            {% block questions_text %}
+                {% if has_permission_to('question.add') %}
+                    <p>{{ __('faq.questions_link', [url('/questions')]) | raw }}</p>
+                {% endif %}
+            {% endblock %}
+
             {% block text %}
                 {% if text|default(null) %}
                     <div class="col-md-12">
@@ -57,6 +64,19 @@
                     </div>
                 {% endfor %}
             {% endblock %}
+
+            {% block ask_question %}
+                {% if has_permission_to('question.add') %}
+                    <form action="{{ url('/questions/new') }}" enctype="multipart/form-data" method="post">
+                        {{ csrf() }}
+                        <div class="col-md-12">
+                            <h4>{{ __('question.add') }}</h4>
+                            {{ f.textarea('text', __('question.question'), {'required': true, 'rows': 5}) }}
+                            {{ f.submit() }}
+                        </div>
+                    </form>
+                {% endif %}
+            {% endblock %}
         </div>
     </div>
 {% endblock %}
diff --git a/resources/views/pages/questions/overview.twig b/resources/views/pages/questions/overview.twig
index 49ce170e..e9dcdab8 100644
--- a/resources/views/pages/questions/overview.twig
+++ b/resources/views/pages/questions/overview.twig
@@ -24,6 +24,12 @@
             {% block row %}
                 <div class="col-md-12">
                     {% block questions %}
+                        {% block faq_text %}
+                            {% if has_permission_to('faq.view') %}
+                                <p>{{ __('question.faq_link', [url('/faq')]) | raw }}</p>
+                            {% endif %}
+                        {% endblock %}
+
                         {% for question in questions %}
                             <div class="row mb-4">
                                 <div class="col-md-12">