diff --git a/controllers/profile.php b/controllers/profile.php
index bba2d033ce61b8553d7ace455f6f3f5267c61b66..277807ce18050245fe2d88bd8f68dbe4d4468477 100644
--- a/controllers/profile.php
+++ b/controllers/profile.php
@@ -87,7 +87,9 @@ class ProfileController extends PluginController
             //Read all attributes:
             $this->target_language_id = Request::get('target_language_id', null);
             $this->level = Request::get('level', null);
-            $this->requested_level = Request::get('requested_level', '');
+            $this->requested_level = Config::get()->TANDEMPLUGIN_USE_LEVEL
+                ? Request::get('requested_level', '')
+                : '';
             $this->comment = Request::get('comment', '');
             $this->gender = Request::get('gender', '');
             if (Config::get()->TANDEMPLUGIN_PROOF_FIELDS_ENABLED) {
@@ -164,7 +166,7 @@ class ProfileController extends PluginController
             //the following is common for add and edit mode:
             $this->tandem_profile->target_language_id = $this->target_language_id;
             $this->tandem_profile->level = $this->level;
-            $this->tandem_profile->requested_level = $this->requested_level;
+            $this->tandem_profile->requested_level = Config::get()->TANDEMPLUGIN_USE_LEVEL ? $this->requested_level : '';
 
             $this->tandem_profile->comment = $this->comment;
             $this->tandem_profile->gender = $this->gender;
@@ -270,8 +272,9 @@ class ProfileController extends PluginController
                 //edit mode
                 $this->target_language_id = $this->tandem_profile->target_language_id;
                 $this->level = $this->tandem_profile->level;
-                $this->requested_level = $this->tandem_profile->requested_level;
-
+                $this->requested_level = Config::get()->TANDEMPLUGIN_USE_LEVEL
+                    ? $this->tandem_profile->requested_level
+                    : '';
                 $this->comment = $this->tandem_profile->comment;
                 $this->gender = $this->tandem_profile->gender;
                 if (Config::get()->TANDEMPLUGIN_PROOF_FIELDS_ENABLED) {
diff --git a/models/TandemProfile.class.php b/models/TandemProfile.class.php
index 3ccfa4fe8d41452a9fbaef2e1726084b81564a3c..aaf392cc03b42eb3411aa8e036eb01a50a454c70 100644
--- a/models/TandemProfile.class.php
+++ b/models/TandemProfile.class.php
@@ -60,7 +60,9 @@ require_once(__DIR__ . '/TandemUserMotherLanguage.class.php');
     {
         return $this->target_language->getLocalName()
             . ' ('
-            . ($this->requested_level ?: $this->level)
+            . (Config::get()->TANDEMPLUGIN_USE_LEVEL && !empty($this->requested_level)
+                ? $this->requested_level
+                : $this->level)
             . ')';
     }
 
diff --git a/plugin.manifest b/plugin.manifest
index 275fbb39382e5302dbfa159df978b2cf2dd66f56..a24fb9dfd957598391e39c7eb038abe3ccb5d7b5 100644
--- a/plugin.manifest
+++ b/plugin.manifest
@@ -1,7 +1,7 @@
 pluginname=TandemPlugin
 pluginclassname=TandemPlugin
 origin=data-quest
-version=1.5.0
+version=1.5.1
 description=Dieses Plugin ermöglicht es, Sprachtandems innerhalb der Stud.IP Platform zu bilden.
 studipMinVersion=5.0
 studipMaxVersion=5.9.99
diff --git a/views/profile/_add_edit_form.php b/views/profile/_add_edit_form.php
index b53a4c19526aefbfdf9778e7f941c30524534690..d7e44550ed744740ad2bbaa282fc3b453765890f 100644
--- a/views/profile/_add_edit_form.php
+++ b/views/profile/_add_edit_form.php
@@ -29,20 +29,22 @@
             <option value="C2" <?= ($level == 'C2' ? 'selected="selected"' : '' ) ?>>C2</option>
         </select>
     </label>
-    <label>
-        <?= dgettext('TandemPlugin', 'Auf welcher Niveaustufe soll die andere Person die gesuchte Sprache mindestens beherrschen?') ?>
-        <select name="requested_level">
-            <option value="" <?= !$requested_level ? 'selected' : '' ?>>
-                <?= dgettext('TandemPlugin', 'Keine Auswahl') ?>
-            </option>
-            <option value="A1" <?= $requested_level == 'A1' ? 'selected' : '' ?>>A1</option>
-            <option value="A2" <?= $requested_level == 'A2' ? 'selected' : '' ?>>A2</option>
-            <option value="B1" <?= $requested_level == 'B1' ? 'selected' : '' ?>>B1</option>
-            <option value="B2" <?= $requested_level == 'B2' ? 'selected' : '' ?>>B2</option>
-            <option value="C1" <?= $requested_level == 'C1' ? 'selected' : '' ?>>C1</option>
-            <option value="C2" <?= $requested_level == 'C2' ? 'selected' : '' ?>>C2</option>
-        </select>
-    </label>
+    <? if (Config::get()->TANDEMPLUGIN_USE_LEVEL) : ?>
+        <label>
+            <?= dgettext('TandemPlugin', 'Auf welcher Niveaustufe soll die andere Person die gesuchte Sprache mindestens beherrschen?') ?>
+            <select name="requested_level">
+                <option value="" <?= !$requested_level ? 'selected' : '' ?>>
+                    <?= dgettext('TandemPlugin', 'Keine Auswahl') ?>
+                </option>
+                <option value="A1" <?= $requested_level == 'A1' ? 'selected' : '' ?>>A1</option>
+                <option value="A2" <?= $requested_level == 'A2' ? 'selected' : '' ?>>A2</option>
+                <option value="B1" <?= $requested_level == 'B1' ? 'selected' : '' ?>>B1</option>
+                <option value="B2" <?= $requested_level == 'B2' ? 'selected' : '' ?>>B2</option>
+                <option value="C1" <?= $requested_level == 'C1' ? 'selected' : '' ?>>C1</option>
+                <option value="C2" <?= $requested_level == 'C2' ? 'selected' : '' ?>>C2</option>
+            </select>
+        </label>
+    <? endif ?>
     <p><?= dgettext('TandemPlugin', 'Hinweis: Dies ist eine Selbsteinschätzung des Sprachniveaus. Es handelt sich nicht um die Einstufung des Fachsprachenzentrums!') ?></p>
     </p>
     <label>