diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py
index 1bca9a9d12..8a146405eb 100644
--- a/cms/djangoapps/contentstore/tests/tests.py
+++ b/cms/djangoapps/contentstore/tests/tests.py
@@ -181,7 +181,7 @@ class AuthTestCase(ContentStoreTestCase):
             )
             self.assertContains(
                 response,
-                '<a class="action action-signin" href="/signin_redirect_to_lms?next=http%3A%2F%2Ftestserver%2F">'
+                '<a class="action action-signin" href="/login/?next=http%3A%2F%2Ftestserver%2F">'
                 'Sign In</a>'
             )
 
diff --git a/cms/envs/common.py b/cms/envs/common.py
index e3e0dcfb6c..1ba2afa642 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -647,11 +647,8 @@ LMS_INTERNAL_ROOT_URL = LMS_ROOT_URL
 # Use LMS SSO for login, once enabled by setting LOGIN_URL (see docs/guides/studio_oauth.rst)
 SOCIAL_AUTH_STRATEGY = 'auth_backends.strategies.EdxDjangoStrategy'
 LOGIN_REDIRECT_URL = EDX_ROOT_URL + '/home/'
-# TODO: Set LOGIN_URL to '/login/' after Studio OAuth transition is complete, and
-# finish ARCH-1253 cleanup. See docs/guides/studio_oauth.rst
-LOGIN_URL = reverse_lazy('login_redirect_to_lms')
-FRONTEND_LOGIN_URL = lambda settings: settings.LMS_ROOT_URL + '/login'
-derived('FRONTEND_LOGIN_URL')
+LOGIN_URL = '/login/'
+FRONTEND_LOGIN_URL = LOGIN_URL
 # Warning: Must have trailing slash to activate correct logout view
 # (auth_backends, not LMS user_authn)
 FRONTEND_LOGOUT_URL = '/logout/'
diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index 1bfc970beb..a7c0827782 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -48,9 +48,6 @@ LMS_BASE = 'localhost:18000'
 LMS_ROOT_URL = f'http://{LMS_BASE}'
 FEATURES['PREVIEW_LMS_BASE'] = "preview." + LMS_BASE
 
-# TODO: Remove after Studio OAuth transition is complete. See docs/guides/studio_oauth.rst
-LOGIN_URL = '/login/'
-FRONTEND_LOGIN_URL = LMS_ROOT_URL + '/login'
 FRONTEND_REGISTER_URL = LMS_ROOT_URL + '/register'
 ########################### PIPELINE #################################
 
diff --git a/docs/guides/studio_oauth.rst b/docs/guides/studio_oauth.rst
index 8f0d381e85..1f82873d0e 100644
--- a/docs/guides/studio_oauth.rst
+++ b/docs/guides/studio_oauth.rst
@@ -28,7 +28,7 @@ For each deployed environment (stage, production, etc.):
      - Go to ``/admin/oauth2_provider/application/add/`` in LMS admin
      - Copy the prepopulated client ID and secret to a secure place
      - Leave the user field empty
-     - Set redirect URLs to ``<STUDIO_ROOT_URL>/complete/edx-oauth2/``
+     - Set redirect URLs to ``<STUDIO_ROOT_URL>/complete/edx-oauth2/`` (as well as for any additional domains, such as internally routed domains)
      - Set client type to ``Confidential``
      - Set authorization grant type to ``Authorization code``
      - Set the name to ``studio-sso``
@@ -52,7 +52,6 @@ For each deployed environment (stage, production, etc.):
 #. Configure Studio to initiative OAuth flow and use a separate session cookie::
 
     LOGIN_URL: /login/  # to activate OAuth functionality
-    SESSION_COOKIE_DOMAIN: <studio domain>  # since no longer using root domain to share with LMS
     SESSION_COOKIE_NAME: studio_sessionid
 
 Cleanup
@@ -63,8 +62,7 @@ Config and code changes to be performed after all environments are using OAuth f
 - Set ``LOGIN_URL`` to ``'/login/'`` in ``cms/envs/common.py``
 - Deploy
 - Remove ``LOGIN_URL`` overrides from all environments (devstack and others)
-- Remove remaining ``ARCH-1253`` detritus (login redirect)
-- Remove this doc!
+- Remove doc (convert to migration instructions for next release)
 
 Declining the migration
 -----------------------
@@ -72,4 +70,5 @@ Declining the migration
 Untested instructions for continuing to keep the shared sessions:
 
 - Override ``FRONTEND_LOGOUT_URL`` for Studio to be ``<LMS base>/logout``
+- Override ``FRONTEND_LOGIN_URL`` for Studio to be ``<LMS base>/login``
 - Override ``LOGIN_URL`` for Studio to be ``<LMS base>/login``