diff --git a/Sources/SpeziAccount/AccountSetup.swift b/Sources/SpeziAccount/AccountSetup.swift
index 1eb48963..d4fdbd21 100644
--- a/Sources/SpeziAccount/AccountSetup.swift
+++ b/Sources/SpeziAccount/AccountSetup.swift
@@ -6,7 +6,6 @@
 // SPDX-License-Identifier: MIT
 //
 
-import OrderedCollections
 import SpeziViews
 import SwiftUI
 
@@ -139,20 +138,21 @@ public struct AccountSetup<Header: View, Continue: View>: View {
             EmptyServicesWarning()
         } else {
             VStack {
-                let categorized = account.accountSetupComponents.reduce(into: OrderedDictionary()) { partialResult, component in
+                let components = account.accountSetupComponents.reduce(
+                    into: [AccountSetupSection: [any AnyAccountSetupComponent]]()
+                ) { dict, component in
                     guard component.configuration.isEnabled else {
                         return
                     }
-                    partialResult[component.configuration.section] = component
+                    dict[component.configuration.section, default: []].append(component)
                 }
-
-                ForEach(categorized.keys.sorted(), id: \.self) { placement in
-                    if let component = categorized[placement] {
-                        component.anyView
-
-                        if categorized.keys.last != placement {
-                            ServicesDivider()
-                        }
+                    .sorted { $0.key < $1.key }
+                    .flatMap(\.value)
+                
+                ForEach(0..<components.endIndex, id: \.self) { idx in
+                    components[idx].anyView
+                    if idx < components.endIndex - 1 {
+                        ServicesDivider()
                     }
                 }
             }
diff --git a/Tests/SpeziAccountTests/SnapshotTesting.swift b/Tests/SpeziAccountTests/SnapshotTesting.swift
index a4194d3e..36aa97b2 100644
--- a/Tests/SpeziAccountTests/SnapshotTesting.swift
+++ b/Tests/SpeziAccountTests/SnapshotTesting.swift
@@ -122,7 +122,7 @@ final class SnapshotTesting: XCTestCase {
         assertSnapshot(of: view3, as: .image(layout: .device(config: .iPhone13Pro)), named: "iphone-view3")
         assertSnapshot(of: view4, as: .image(layout: .device(config: .iPhone13Pro)), named: "iphone-view4")
         assertSnapshot(of: view5, as: .image(layout: .device(config: .iPhone13Pro)), named: "iphone-view5")
-
+        
         assertSnapshot(of: view0Signup, as: .image(layout: .device(config: .iPhone13Pro)), named: "iphone-view0-signup")
         assertSnapshot(of: view1Signup, as: .image(layout: .device(config: .iPhone13Pro)), named: "iphone-view1-signup")
         assertSnapshot(of: view2Signup, as: .image(layout: .device(config: .iPhone13Pro)), named: "iphone-view2-signup")
diff --git a/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view0.png b/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view0.png
index c8633444..3565a94f 100644
Binary files a/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view0.png and b/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view0.png differ
diff --git a/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view1.png b/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view1.png
index 2abbc85a..e4dbc222 100644
Binary files a/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view1.png and b/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view1.png differ
diff --git a/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view2-signup.png b/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view2-signup.png
index cd4b2ca8..f38eb301 100644
Binary files a/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view2-signup.png and b/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view2-signup.png differ
diff --git a/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view2.png b/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view2.png
index cd4b2ca8..f38eb301 100644
Binary files a/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view2.png and b/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view2.png differ
diff --git a/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view4-signup.png b/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view4-signup.png
index c73e8554..78dc4d58 100644
Binary files a/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view4-signup.png and b/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view4-signup.png differ
diff --git a/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view4.png b/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view4.png
index c73e8554..78dc4d58 100644
Binary files a/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view4.png and b/Tests/SpeziAccountTests/__Snapshots__/SnapshotTesting/testAccountProviderViewLayoutVariations.iphone-view4.png differ