diff --git a/templates/jwinf/profile.hbs b/templates/jwinf/profile.hbs
index b0ebd20d3b8996727fa39ee6a69b19ad9ab6d999..e26e223a9c3a995fd07f9e44de619e5d17c8d0ad 100644
--- a/templates/jwinf/profile.hbs
+++ b/templates/jwinf/profile.hbs
@@ -87,8 +87,11 @@
       {{/if}}
       <tr>
          <td>Jahrgangsstufe:</td><td>
-            <select name="grade">
-               <option value="0" {{ sel0 }}>Noch kein Schüler</option>
+            <select name="grade" required>
+               <option value=""></option>
+               {{#if allow_notyetstudent}}
+                  <option value="0" {{ sel0 }}>Noch kein Schüler</option>
+               {{/if}}
                <option value="1" {{ sel1 }}>1</option>
                <option value="2" {{ sel2 }}>2</option>
                <option value="3" {{ sel3 }}>3</option>