diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb
--- a/app/controllers/login_controller.rb
+++ b/app/controllers/login_controller.rb
@@ -7,7 +7,10 @@
   end
 
   def login
-    if user = User.authenticate(params[:login], params[:password])
+    if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree])
+      flash[:notice] = 'You must accept the agreement before logging in'
+      redirect_to :controller => 'main', :action => 'login'
+    elsif user = User.authenticate(params[:login], params[:password])
       session[:user_id] = user.id
       session[:admin] = user.admin?