diff --git a/app/assets/javascripts/discourse/app/controllers/signup.js b/app/assets/javascripts/discourse/app/controllers/signup.js
index 74b33ff027cfe..c016c1c1b14cc 100644
--- a/app/assets/javascripts/discourse/app/controllers/signup.js
+++ b/app/assets/javascripts/discourse/app/controllers/signup.js
@@ -378,6 +378,16 @@ export default class SignupPageController extends Controller {
     return findAll().length > 0;
   }
 
+  @discourseComputed("authOptions", "hasAtLeastOneLoginButton")
+  showRightSide(authOptions, hasAtLeastOneLoginButton) {
+    return !authOptions && hasAtLeastOneLoginButton;
+  }
+
+  @discourseComputed("authOptions")
+  progressBarStep(authOptions) {
+    return authOptions ? "activate" : "signup";
+  }
+
   fetchConfirmationValue() {
     if (this._challengeDate === undefined && this._hpPromise) {
       // Request already in progress
diff --git a/app/assets/javascripts/discourse/app/templates/signup.gjs b/app/assets/javascripts/discourse/app/templates/signup.gjs
index 08b765f6e1b06..fda9b8666ad12 100644
--- a/app/assets/javascripts/discourse/app/templates/signup.gjs
+++ b/app/assets/javascripts/discourse/app/templates/signup.gjs
@@ -56,7 +56,7 @@ export default RouteTemplate(
               @controller.authOptions.auth_provider
             }}
           >
-            <SignupProgressBar @step="signup" />
+            <SignupProgressBar @step={{@controller.progressBarStep}} />
             <WelcomeHeader
               id="create-account-title"
               @header={{i18n "create_account.header_title"}}
@@ -316,10 +316,12 @@ export default RouteTemplate(
             {{/if}}
           </div>
 
-          {{#if @controller.hasAtLeastOneLoginButton}}
+          {{#if @controller.showRightSide}}
             {{#if @controller.site.mobileView}}
-              <div class="login-or-separator"><span>
-                  {{i18n "login.or"}}</span></div>{{/if}}
+              <div class="login-or-separator">
+                <span>{{i18n "login.or"}}</span>
+              </div>
+            {{/if}}
             <div class="login-right-side">
               <LoginButtons
                 @externalLogin={{@controller.externalLogin}}
diff --git a/spec/system/page_objects/pages/signup.rb b/spec/system/page_objects/pages/signup.rb
index 5243b12627168..afdd94bbc955e 100644
--- a/spec/system/page_objects/pages/signup.rb
+++ b/spec/system/page_objects/pages/signup.rb
@@ -51,6 +51,10 @@ def has_no_name_input?
         has_no_css?("#new-account-name")
       end
 
+      def has_no_right_side_column?
+        has_no_css?(".login-right-side")
+      end
+
       def fill_input(selector, text)
         if page.has_css?("html.mobile-view", wait: 0)
           expect(page).to have_no_css(".d-modal.is-animating")
diff --git a/spec/system/social_authentication_spec.rb b/spec/system/social_authentication_spec.rb
index 80d1cc15e2860..372809b392c7a 100644
--- a/spec/system/social_authentication_spec.rb
+++ b/spec/system/social_authentication_spec.rb
@@ -26,6 +26,8 @@
         expect(signup_form).to have_no_password_input
         expect(signup_form).to have_valid_username
         expect(signup_form).to have_valid_email
+        expect(signup_form).to have_no_right_side_column
+
         signup_form.click_create_account
         expect(page).to have_css(".header-dropdown-toggle.current-user")
       end
@@ -44,6 +46,8 @@
         expect(signup_form).to have_no_password_input
         expect(signup_form).to have_valid_username
         expect(signup_form).to have_valid_email
+        expect(signup_form).to have_no_right_side_column
+
         signup_form.click_create_account
         expect(page).to have_css(".header-dropdown-toggle.current-user")
       end
@@ -58,6 +62,8 @@
           expect(signup_form).to have_no_password_input
           expect(signup_form).to have_valid_username
           expect(signup_form).to have_valid_email
+          expect(signup_form).to have_no_right_side_column
+
           signup_form.click_create_account
           expect(page).to have_css(".account-created")
         end
@@ -77,6 +83,7 @@
         expect(signup_form).to have_no_password_input
         expect(signup_form).to have_valid_username
         expect(signup_form).to have_valid_email
+        expect(signup_form).to have_no_right_side_column
         signup_form.click_create_account
         expect(page).to have_css(".header-dropdown-toggle.current-user")
       end
@@ -91,6 +98,7 @@
           expect(signup_form).to have_no_password_input
           expect(signup_form).to have_valid_username
           expect(signup_form).to have_valid_email
+          expect(signup_form).to have_no_right_side_column
           signup_form.click_create_account
           expect(page).to have_css(".account-created")
         end
@@ -111,6 +119,7 @@
         signup_form.fill_email(OmniauthHelpers::EMAIL)
         expect(signup_form).to have_valid_username
         expect(signup_form).to have_valid_email
+        expect(signup_form).to have_no_right_side_column
         signup_form.click_create_account
         expect(page).to have_css(".account-created")
       end
@@ -145,6 +154,7 @@
         expect(signup_form).to have_no_password_input
         expect(signup_form).to have_valid_username
         expect(signup_form).to have_valid_email
+        expect(signup_form).to have_no_right_side_column
         signup_form.click_create_account
         expect(page).to have_css(".header-dropdown-toggle.current-user")
       end
@@ -167,6 +177,7 @@
         expect(signup_form).to have_no_password_input
         expect(signup_form).to have_valid_username
         expect(signup_form).to have_valid_email
+        expect(signup_form).to have_no_right_side_column
         signup_form.click_create_account
         expect(page).to have_css(".header-dropdown-toggle.current-user")
       end
@@ -186,6 +197,7 @@
         expect(signup_form).to have_no_password_input
         expect(signup_form).to have_valid_username
         expect(signup_form).to have_valid_email
+        expect(signup_form).to have_no_right_side_column
         signup_form.click_create_account
         expect(page).to have_css(".header-dropdown-toggle.current-user")
       end