diff --git a/c3l_membership/forms.py b/c3l_membership/forms.py
--- a/c3l_membership/forms.py
+++ b/c3l_membership/forms.py
@@ -24,16 +24,27 @@ class MembershipForm(Form):
         "Membership Plan",
         validators=[InputRequired("Please select one of the options!")],
         choices=[
-            ("regular", "Regular membership (120€/year)"),
-            ("student", "Student membership (40€/year)"),
+            (
+                "regular",
+                "Regular membership - Membership with voting rights on the general assembly.",
+            ),
             (
                 "supporting",
-                "Supporting membership (40€/year) - Membership without voting rights",
+                "Supporting membership - Membership without voting rights on the general assembly.",
             ),
-            ("starving", "Starving Hacker - Get in touch with us at info@c3l.lu"),
         ],
     )
 
+    student = BooleanField(
+        ("I am a student and would like to have the reduced membership fees."),
+    )
+
+    starving = BooleanField(
+        (
+            "I am a starving hacker and cannot afford the membership! (Please get in touch with us at info@c3l.lu before filling out this membership form)"
+        )
+    )
+
     payment = RadioField(
         "Payment Options",
         validators=[InputRequired("Please select one of the options!")],
diff --git a/c3l_membership/templates/index.html b/c3l_membership/templates/index.html
--- a/c3l_membership/templates/index.html
+++ b/c3l_membership/templates/index.html
@@ -60,6 +60,20 @@
               {{ option.label.text }}
             </label>
             {% endfor %}
+            <div class="pure-g">
+              <div class="pure-u-1-1">
+                <label for="{{ form.student.id }}" class="pure-checkbox">
+                {{ form.student }} {{ form.student.label.text|safe}}
+                </label>
+              </div>
+            </div>
+            <div class="pure-g">
+              <div class="pure-u-1-1">
+                <label for="{{ form.starving.id }}" class="pure-checkbox">
+                  {{ form.starving }} {{ form.starving.label.text|safe}}
+                </label>
+              </div>
+            </div>
             <h3>What's difference between the different membership options?</h3>
             <p>All the options include to following benefits:</p>
             <ul>
diff --git a/c3l_membership/templates/member.html b/c3l_membership/templates/member.html
--- a/c3l_membership/templates/member.html
+++ b/c3l_membership/templates/member.html
@@ -25,7 +25,11 @@
       <dt>Country:</dt>
       <dd>{{ form.country.data if form.country.data else "<i>Not specified</i>"|safe }}</dd>
       <dt>Membership Plan:</dt>
-      <dd>{{ membership }}</dd>
+      <dd>{{ form.membership.data }}</dd>
+      <dt>Student:</dt>
+      <dd>{{ "Yes" if form.student.data else "No" }}</dd>
+      <dt>Starving:</dt>
+      <dd>{{ "Yes" if form.starving.data else "No" }}</dd>
       <dt>Payment:</dt>
       <dd>{{ form.payment.data }}</dd>
       <dt>Agreed to Terms &amp; Conditions:</dt>
diff --git a/c3l_membership/views.py b/c3l_membership/views.py
--- a/c3l_membership/views.py
+++ b/c3l_membership/views.py
@@ -14,17 +14,17 @@ def index():
     form = MembershipForm()
     if form.validate_on_submit():
 
-        if form.minor_member.data and form.membership.data != "starving":
-            membership = "student"
-        else:
-            membership = form.membership.data
+        if (
+            form.minor_member.data
+            or form.student.data
+            or form.membership.data == "supporting"
+        ):
+            price = 40
+        elif form.membership.data == "regular":
+            price = 120
 
-        if membership in ["student", "supporting"]:
-            price = 40
-        elif membership == "starving":
+        if form.starving.data:
             price = 1
-        else:
-            price = 120
 
         if form.payment.data == "bitcoin":
             price = subprocess.check_output(
@@ -39,8 +39,6 @@ def index():
 
         year = date.today().year
 
-        html = render_template(
-            "member.html", form=form, membership=membership, price=price, year=year
-        )
+        html = render_template("member.html", form=form, price=price, year=year)
         return render_pdf(HTML(string=html))
     return render_template("index.html", form=form)