diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 3b9ff2e0..a2985850 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -263,11 +263,12 @@ class AccountsController < ApplicationController
                       :expires => 1.month.from_now,
                       :path => '/',
                       :secure => false,
-                      :httponly => true
+                      :httponly => true,
+                      :domain => "/"
                      }
-    if edu_setting('cookie_domain').present?
-      cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
-    end
+    # if edu_setting('cookie_domain').present?
+    #   cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
+    # end
     cookies[autologin_cookie_name] = cookie_options
     cookies.signed[:user_id] ||= user.id
 
diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index d554705b..f999cd4c 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -17,11 +17,12 @@ module LoginHelper
       :expires => 1.month.from_now,
       :path => '/',
       :secure => false,
-      :httponly => false
+      :httponly => false,
+      :domain => "/"
     }
-    if edu_setting('cookie_domain').present?
-      cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
-    end
+    # if edu_setting('cookie_domain').present?
+    #   cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
+    # end
     unless  cookies[autologin_cookie_name].present?
       cookies[autologin_cookie_name] = cookie_options
     end