diff --git a/aleksis/apps/mensa/forms.py b/aleksis/apps/mensa/forms.py
index fa698b5db407a9ca0a710fca6597bf43155ba36e..70df69bcf2c03a459e2dfac25116c8d35e929a32 100644
--- a/aleksis/apps/mensa/forms.py
+++ b/aleksis/apps/mensa/forms.py
@@ -8,11 +8,11 @@ from .models import Menu
 current_year = timezone.datetime.now().year
 options_for_year = [(current_year, current_year), (current_year + 1, current_year + 1)]
 
-calendar_weeks = [(cw, cw) for cw in range(1, 53)]
+calendar_weeks = [(cw, str(cw)) for cw in range(1, 53)]
 
 
 class MenuUploadForm(forms.ModelForm):
-    calendar_week = forms.ChoiceField(choices=calendar_weeks)
+    calendar_week = forms.ChoiceField(choices=calendar_weeks, initial=timezone.datetime.now().isocalendar()[1])
     year = forms.ChoiceField(
         initial=timezone.datetime.now().year, choices=options_for_year
     )