diff --git a/fet2020/members/forms.py b/fet2020/members/forms.py
index d88cf1b8..d8e78616 100644
--- a/fet2020/members/forms.py
+++ b/fet2020/members/forms.py
@@ -8,7 +8,7 @@ class MyMemberForm(forms.ModelForm):
     class Meta:
         model = Member
         fields = ['firstname', 'surname', 'nickname','mailaccount', 'role',
-        'description', 'image', 'phone', 'address']
+        'description', 'image', 'birthday', 'phone', 'address']
 
         widgets = {'description': CKEditorUploadingWidget(config_name='default')}
 
diff --git a/fet2020/members/models.py b/fet2020/members/models.py
index c7de885b..311c107a 100644
--- a/fet2020/members/models.py
+++ b/fet2020/members/models.py
@@ -27,7 +27,7 @@ class Member(models.Model):
     description = models.TextField(null=True, blank=True)
     image = models.ImageField(null=True, blank=True)
 
-    birthday = models.DateTimeField(null=True, blank=True)
+    birthday = models.DateField(null=True, blank=True)
 
     phone_error_msg =_(("Phone number must be entered in the format: "
         "+999999999'. Up to 15 digits allowed."))
diff --git a/fet2020/members/views.py b/fet2020/members/views.py
index a1bbe039..b5c6c334 100644
--- a/fet2020/members/views.py
+++ b/fet2020/members/views.py
@@ -11,12 +11,13 @@ from django_filters.rest_framework import DjangoFilterBackend
 
 
 def index(request):
-    member = deque(Member.member.all())
-    jobmember = deque(JobMember.jobmember.all())
+    #members = deque(Member.all_members.all())
+    members = deque(Member.all_members.prefetch_related('has_jobs'))
+
+    #jobmember = deque(JobMember.jobmember.all())
 
     context = {
-        "member": member,
-        "jobmember": jobmember
+        "member": members
     }
 
     return render(request, 'member/index.html', context)