diff --git a/client/package-lock.json b/client/package-lock.json
index bf620023..450cc04c 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -2460,7 +2460,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -2492,7 +2492,7 @@
         },
         "onetime": {
           "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
           "dev": true
         },
@@ -13371,7 +13371,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
diff --git a/server/portfolio/schema.py b/server/portfolio/schema.py
index 780ff14b..2bddb5f6 100644
--- a/server/portfolio/schema.py
+++ b/server/portfolio/schema.py
@@ -1,6 +1,7 @@
 import graphene
 from graphene import relay
 from graphene_django import DjangoObjectType
+from django.db.models import Q
 from graphene_django.filter import DjangoFilterConnectionField
 
 from api.utils import get_by_id_or_slug
@@ -40,7 +41,8 @@ class PortfolioQuery(object):
             return Project.objects.all().order_by('-pk')
 
         if UserRole.get_role_for_user(user).role == Role.objects.get_default_teacher_role():
-            return Project.objects.filter(student__school_classes__in=user.school_classes.all(), final=True)
+            return Project.objects.filter(Q(student__school_classes__in=user.school_classes.all(), final=True) |
+                                          Q(student=user, final=False)).distinct()
 
         return Project.objects.filter(student=user)