diff --git a/core/templates/base.html b/core/templates/base.html
index 79ce983fc83b85582b0684f1d1223d6415bf30cd..843803290e0e9a1b3a4ee5fb750db73d49e1fc7a 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -52,7 +52,7 @@
   <form id="login_form" class="navbar-form form-inline" role="form" method="post" action="/login/">
     {% csrf_token %}
     <div class="form-group mx-sm-1">
-      <input type="text" class="form-control" name="username" value="" placeholder="Username">
+      <input type="text" class="form-control" name="username" value="" placeholder="Username" autofocus>
     </div>
     <div class="form-group mx-sm-1">
       <input type="password" class="form-control" name="password" value="" placeholder="Password">
diff --git a/core/views/user_startpages.py b/core/views/user_startpages.py
index ab958d34c4450fbca0f81cda2bd04887a16b8fa1..6f356ed5fbd75c0ee47493337b75b2eca669d339 100644
--- a/core/views/user_startpages.py
+++ b/core/views/user_startpages.py
@@ -45,7 +45,7 @@ def get_annotated_feedback_count():
 def tutor_view(request):
     context = {
         'submission_type_list': get_annotated_feedback_count(),
-        'feedback_list': Feedback.objects.filter(of_tutor=request.user).order_by('status', '-modified'),
+        'feedback_list': Feedback.objects.filter(of_tutor=request.user),
         'feedback_open_list': Feedback.objects.filter(Q(status=Feedback.OPEN) & ~Q(of_tutor=request.user)),
     }
     return render(request, 'core/tutor_startpage.html', context)