diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 16f32c6c..5e8337b3 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -30,5 +30,4 @@ Please describe how this can be tested by reviewers. Tests must be added for new
 * [ ] All existing and new tests complete without errors
 * [ ] All code quality tools/guidelines in the [Contribution guide](CONTRIBUTION.md) have been run/followed
 * [ ] All relevant assets have been compiled as directed in the [Contribution guide](CONTRIBUTION.md), if applicable
-* [ ] This PR is rebased against the `dev` branch
 * [ ] All active GitHub CI checks have passed
\ No newline at end of file
diff --git a/lib/admin/WP_Auth0_Admin_Advanced.php b/lib/admin/WP_Auth0_Admin_Advanced.php
index 1f0a2302..6b96b234 100644
--- a/lib/admin/WP_Auth0_Admin_Advanced.php
+++ b/lib/admin/WP_Auth0_Admin_Advanced.php
@@ -117,12 +117,6 @@ public function init() {
 				'id'       => 'wpa0_auto_login',
 				'function' => 'render_auto_login',
 			),
-			array(
-				'name'     => __( 'Auto Login Method', 'wp-auth0' ),
-				'opt'      => 'auto_login_method',
-				'id'       => 'wpa0_auto_login_method',
-				'function' => 'render_auto_login_method',
-			),
 			array(
 				'name'     => __( 'Implicit Login Flow', 'wp-auth0' ),
 				'opt'      => 'auth0_implicit_workflow',
@@ -434,38 +428,12 @@ public function render_migration_ws_ips( $args = array() ) {
 	}
 
 	/**
-	 * Render form field and description for the `auto_login` option.
+	 * Refer to the Features tab for the `auto_login` option.
 	 * IMPORTANT: Internal callback use only, do not call this function directly!
-	 *
-	 * @param array $args - callback args passed in from add_settings_field().
-	 *
-	 * @see WP_Auth0_Admin_Generic::init_option_section()
-	 * @see add_settings_field()
 	 */
-	public function render_auto_login( $args = array() ) {
-		$this->render_switch( $args['label_for'], $args['opt_name'], 'wpa0_auto_login_method' );
+	public function render_auto_login() {
 		$this->render_field_description(
-			__( 'Send logins directly to a specific Connection, skipping the login page', 'wp-auth0' )
-		);
-	}
-
-	/**
-	 * Render form field and description for the `auto_login_method` option.
-	 * IMPORTANT: Internal callback use only, do not call this function directly!
-	 *
-	 * @param array $args - callback args passed in from add_settings_field().
-	 *
-	 * @see WP_Auth0_Admin_Generic::init_option_section()
-	 * @see add_settings_field()
-	 */
-	public function render_auto_login_method( $args = array() ) {
-		$this->render_text_field( $args['label_for'], $args['opt_name'] );
-		$this->render_field_description(
-			sprintf(
-				__( 'Find the method name to use under Connections > [Connection Type] in your %s. ', 'wp-auth0' ),
-				$this->get_dashboard_link()
-			) .
-			__( 'Click the expand icon and use the value in the "Name" field (like "google-oauth2")', 'wp-auth0' )
+			__( 'Please see the "Universal Login Page" setting on the Features tab', 'wp-auth0' )
 		);
 	}
 
diff --git a/lib/admin/WP_Auth0_Admin_Features.php b/lib/admin/WP_Auth0_Admin_Features.php
index 232e724e..3b8f9b72 100644
--- a/lib/admin/WP_Auth0_Admin_Features.php
+++ b/lib/admin/WP_Auth0_Admin_Features.php
@@ -62,6 +62,18 @@ public function init() {
 				'id'       => 'wpa0_passwordless_enabled',
 				'function' => 'render_passwordless_enabled',
 			),
+			array(
+				'name'     => __( 'Universal Login Page', 'wp-auth0' ),
+				'opt'      => 'auto_login',
+				'id'       => 'wpa0_auto_login',
+				'function' => 'render_auto_login',
+			),
+			array(
+				'name'     => __( 'Auto Login Method', 'wp-auth0' ),
+				'opt'      => 'auto_login_method',
+				'id'       => 'wpa0_auto_login_method',
+				'function' => 'render_auto_login_method',
+			),
 			array(
 				'name'     => __( 'Multifactor Authentication (MFA)', 'wp-auth0' ),
 				'opt'      => 'mfa',
@@ -195,6 +207,46 @@ public function render_passwordless_enabled( $args = array() ) {
 		);
 	}
 
+	/**
+	 * Render form field and description for the `auto_login` option.
+	 * IMPORTANT: Internal callback use only, do not call this function directly!
+	 *
+	 * @param array $args - callback args passed in from add_settings_field().
+	 *
+	 * @see WP_Auth0_Admin_Generic::init_option_section()
+	 * @see add_settings_field()
+	 */
+	public function render_auto_login( $args = array() ) {
+		$this->render_switch( $args['label_for'], $args['opt_name'], 'wpa0_auto_login_method' );
+		$this->render_field_description(
+			__( 'Use the Universal Login Page (ULP) for authentication. ', 'wp-auth0' ) .
+			__( 'When turned on, <code>wp-login.php</code> will redirect to the hosted login page. ', 'wp-auth0' ) .
+			__( 'When turned off, <code>wp-login.php</code> will show an embedded login form. ', 'wp-auth0' ) .
+			$this->get_docs_link( 'guides/login/universal-vs-embedded', __( 'More on ULP vs embedded here', 'wp-auth0' ) )
+		);
+	}
+
+	/**
+	 * Render form field and description for the `auto_login_method` option.
+	 * IMPORTANT: Internal callback use only, do not call this function directly!
+	 *
+	 * @param array $args - callback args passed in from add_settings_field().
+	 *
+	 * @see WP_Auth0_Admin_Generic::init_option_section()
+	 * @see add_settings_field()
+	 */
+	public function render_auto_login_method( $args = array() ) {
+		$this->render_text_field( $args['label_for'], $args['opt_name'] );
+		$this->render_field_description(
+			__( 'Enter a name here to automatically use a single, specific connection to login . ', 'wp-auth0' ) .
+			sprintf(
+				__( 'Find the method name to use under Connections > [Connection Type] in your %s. ', 'wp-auth0' ),
+				$this->get_dashboard_link()
+			) .
+			__( 'Click the expand icon and use the value in the "Name" field (like "google-oauth2")', 'wp-auth0' )
+		);
+	}
+
 	/**
 	 * Render form field and description for the `mfa` option.
 	 * IMPORTANT: Internal callback use only, do not call this function directly!