diff --git a/feature/registration/src/main/java/org/signal/registration/screens/RegistrationScaffold.kt b/feature/registration/src/main/java/org/signal/registration/screens/RegistrationScaffold.kt
index fd1b7899d8..589dfe7752 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/RegistrationScaffold.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/RegistrationScaffold.kt
@@ -102,8 +102,8 @@ object RegistrationScaffold {
       override val edgeInset: Dp,
       override val maxButtonWidth: Dp
     ) : Params {
-      fun panePadding(hasHeader: Boolean) = PaddingValues(
-        top = if (hasHeader) paneVerticalInset else headerSlotHeight + paneVerticalInset,
+      fun panePadding(hasHeader: Boolean, includeTopInset: Boolean = true) = PaddingValues(
+        top = (if (hasHeader) 0.dp else headerSlotHeight) + (if (includeTopInset) paneVerticalInset else 0.dp),
         bottom = paneVerticalInset,
         start = paneHorizontalInset,
         end = paneHorizontalInset
@@ -225,6 +225,7 @@ fun OnePaneRegistrationScaffold(
   params: RegistrationScaffold.Params.OnePane,
   topBar: (@Composable () -> Unit)? = null,
   footer: (@Composable () -> Unit)? = null,
+  includeTopInset: Boolean = true,
   content: @Composable (PaddingValues) -> Unit
 ) {
   RegistrationScaffold(
@@ -237,7 +238,7 @@ fun OnePaneRegistrationScaffold(
           .fillMaxSize()
           .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal))
       ) {
-        content(params.panePadding(hasHeader = topBar != null))
+        content(params.panePadding(hasHeader = topBar != null, includeTopInset = includeTopInset))
       }
     }
   )
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/signalloginpayment/SignalLoginPaymentScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/signalloginpayment/SignalLoginPaymentScreen.kt
index 0abf4c8610..3d82211ca7 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/signalloginpayment/SignalLoginPaymentScreen.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/signalloginpayment/SignalLoginPaymentScreen.kt
@@ -139,6 +139,7 @@ private fun OnePaneLayout(
   OnePaneRegistrationScaffold(
     params = params,
     topBar = { BackTopAppBar(scrollBehavior = topBarScrollBehavior, onBackClick = { onEvent(SignalLoginPaymentScreenEvents.BackClicked) }) },
+    includeTopInset = false,
     content = { paddingValues ->
       Column(
         horizontalAlignment = Alignment.CenterHorizontally,