diff --git a/app/controllers/grades_controller.rb b/app/controllers/grades_controller.rb
index 5267244..937b2c2 100644
--- a/app/controllers/grades_controller.rb
+++ b/app/controllers/grades_controller.rb
@@ -49,7 +49,9 @@ class GradesController < ApplicationController
         render :new_lecturer
       end
     elsif logged_in_as_student
-      @grade = Grade.new(params.require(:grade).permit(:student_id, :lecture_id, :submission))
+      grade_params = params.require(:grade).permit(:lecture_id, :submission)
+      grade_params[:student_id] = current_user.id
+      @grade = Grade.new(grade_params)
       if @grade.save
         flash[:success] = "Report submitted!"
         redirect_to grades_path
diff --git a/app/views/grades/new_student.html.erb b/app/views/grades/new_student.html.erb
index eadce47..16bfac2 100644
--- a/app/views/grades/new_student.html.erb
+++ b/app/views/grades/new_student.html.erb
@@ -4,10 +4,6 @@
     <div class="w3-col" style="width: 100px"><%= f.label :lecture %></div>
     <div class="w3-rest"><%= f.select(:lecture_id, Lecture.all.collect {|p| [ p.name, p.id ] }) %></div>
   </div>
-  <div class="w3-row w3-section">
-    <div class="w3-col" style="width: 100px"><%= f.label :student %></div>
-    <div class="w3-rest"><%= f.select(:student_id, User.where(role: "student").collect {|p| [ p.login, p.id ] }) %></div>
-  </div>
   <div class="w3-row w3-section">
     <div class="w3-col" style="width: 100px"><%= f.label :submission %></div>
     <div class="w3-rest">