diff --git a/panels/system/users/cc-user-page.c b/panels/system/users/cc-user-page.c
index f0a1888dc90954e522f66fb58b9121920fcb5fa6..321605c18c2d2aeae103ae0f44d4ffbb6137edf1 100644
--- a/panels/system/users/cc-user-page.c
+++ b/panels/system/users/cc-user-page.c
@@ -58,13 +58,13 @@ struct _CcUserPage {
 
     CcListRow           *account_type_row;
     GtkSwitch           *account_type_switch;
-    GtkBox              *action_area;
     AdwAvatar           *avatar;
     CcAvatarChooser     *avatar_chooser;
     GtkMenuButton       *avatar_edit_button;
     GtkButton           *avatar_remove_button;
     AdwActionRow        *auto_login_row;
     GtkSwitch           *auto_login_switch;
+    AdwPreferencesGroup *button_group;
     CcListRow           *fingerprint_row;
     CcListRow           *language_row;
     AdwEntryRow         *fullname_row;
@@ -73,6 +73,7 @@ struct _CcUserPage {
 #endif
     CcListRow           *password_row;
     CcPermissionInfobar *permission_infobar;
+    AdwPreferencesPage  *preferences_page;
     AdwSwitchRow        *remove_local_files_choice;
     GtkWidget           *remove_user_button;
     AdwAlertDialog      *remove_local_user_dialog;
@@ -447,7 +448,14 @@ cc_user_page_buildable_add_child (GtkBuildable *buildable,
 {
     CcUserPage *self = CC_USER_PAGE (buildable);
 
-    gtk_box_append (self->action_area, GTK_WIDGET (child));
+    /* Let's keep the button group last */
+    if (ADW_IS_PREFERENCES_GROUP (child)) {
+        adw_preferences_page_remove (self->preferences_page, self->button_group);
+        adw_preferences_page_add (self->preferences_page, ADW_PREFERENCES_GROUP (child));
+        adw_preferences_page_add (self->preferences_page, self->button_group);
+    } else {
+        adw_preferences_group_add (self->button_group, GTK_WIDGET (child));
+    }
 }
 
 static void
@@ -633,7 +641,6 @@ cc_user_page_class_init (CcUserPageClass * klass)
 
     gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/system/users/cc-user-page.ui");
 
-    gtk_widget_class_bind_template_child (widget_class, CcUserPage, action_area);
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, avatar);
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, avatar_edit_button);
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, avatar_remove_button);
@@ -641,6 +648,7 @@ cc_user_page_class_init (CcUserPageClass * klass)
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, account_type_switch);
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, auto_login_row);
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, auto_login_switch);
+    gtk_widget_class_bind_template_child (widget_class, CcUserPage, button_group);
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, fingerprint_row);
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, fullname_row);
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, language_row);
@@ -649,6 +657,7 @@ cc_user_page_class_init (CcUserPageClass * klass)
 #endif
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, password_row);
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, permission_infobar);
+    gtk_widget_class_bind_template_child (widget_class, CcUserPage, preferences_page);
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, remove_local_files_choice);
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, remove_local_user_dialog);
     gtk_widget_class_bind_template_child (widget_class, CcUserPage, remove_user_button);
diff --git a/panels/system/users/cc-user-page.ui b/panels/system/users/cc-user-page.ui
index 5bf5bdce0ac4e1231b71dba49beb70ba806b8c0f..cea2ea99abe7a4f9223636bd36beb39eadf10a0d 100644
--- a/panels/system/users/cc-user-page.ui
+++ b/panels/system/users/cc-user-page.ui
@@ -13,7 +13,7 @@
               <object class="CcPermissionInfobar" id="permission_infobar"/>
             </child>
             <child>
-              <object class="AdwPreferencesPage">
+              <object class="AdwPreferencesPage" id="preferences_page">
                 <child>
                   <object class="AdwPreferencesGroup">
                     <child>
@@ -190,26 +190,18 @@
                 </child>
 
                 <child>
-                  <object class="AdwPreferencesGroup">
+                  <object class="AdwPreferencesGroup" id="button_group">
+                    <property name="separate-rows">True</property>
                     <child>
-                      <object class="GtkBox" id="action_area">
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">12</property>
-
-                        <child>
-                          <object class="GtkButton" id="remove_user_button">
-                            <property name="visible" bind-source="CcUserPage" bind-property="is-current-user" bind-flags="invert-boolean"/>
-                            <property name="sensitive" bind-source="CcUserPage" bind-property="editable" bind-flags="sync-create"/>
-                            <property name="label" translatable="yes">_Remove User…</property>
-                            <property name="use-underline">True</property>
-                            <property name="halign">center</property>
-                            <signal name="clicked" handler="remove_user" object="CcUserPage" swapped="yes"/>
-                            <style>
-                              <class name="destructive-action"/>
-                              <class name="pill"/>
-                            </style>
-                          </object>
-                        </child>
+                      <object class="AdwButtonRow" id="remove_user_button">
+                        <property name="visible" bind-source="CcUserPage" bind-property="is-current-user" bind-flags="invert-boolean"/>
+                        <property name="sensitive" bind-source="CcUserPage" bind-property="editable" bind-flags="sync-create"/>
+                        <property name="title" translatable="yes">_Remove User…</property>
+                        <property name="use-underline">True</property>
+                        <signal name="activated" handler="remove_user" object="CcUserPage" swapped="yes"/>
+                        <style>
+                          <class name="destructive-action"/>
+                        </style>
                       </object>
                     </child>
                   </object>
diff --git a/panels/system/users/cc-users-page.ui b/panels/system/users/cc-users-page.ui
index e95729a2e46cc0afad1107dad1d6a3385921637c..ca19db50a9b6a24596b51946dfbe95aa447f75a0 100644
--- a/panels/system/users/cc-users-page.ui
+++ b/panels/system/users/cc-users-page.ui
@@ -27,28 +27,22 @@
             </child>
 
             <child>
-              <object class="AdwPreferencesGroup">
-                <property name="separate-rows">True</property>
-                <child>
-                  <object class="AdwButtonRow" id="add_user_button_row">
-                    <property name="title" translatable="yes">_Add User</property>
-                    <property name="end-icon-name">go-next-symbolic</property>
-                    <property name="use_underline">True</property>
-                    <signal name="activated" handler="add_user" object="CcUsersPage" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwButtonRow" id="add_enterprise_user_button_row">
-                    <property name="visible">False</property>
-                    <property name="title" translatable="yes">Add _Enterprise Login</property>
-                    <property name="use_underline">True</property>
-                    <property name="end-icon-name">go-next-symbolic</property>
-                    <signal name="activated" handler="add_enterprise_user" object="CcUsersPage" swapped="yes"/>
-                  </object>
-                </child>
+              <object class="AdwButtonRow" id="add_user_button_row">
+                <property name="title" translatable="yes">_Add User</property>
+                <property name="end-icon-name">go-next-symbolic</property>
+                <property name="use_underline">True</property>
+                <signal name="activated" handler="add_user" object="CcUsersPage" swapped="yes"/>
+              </object>
+            </child>
+            <child>
+              <object class="AdwButtonRow" id="add_enterprise_user_button_row">
+                <property name="visible">False</property>
+                <property name="title" translatable="yes">Add _Enterprise Login</property>
+                <property name="use_underline">True</property>
+                <property name="end-icon-name">go-next-symbolic</property>
+                <signal name="activated" handler="add_enterprise_user" object="CcUsersPage" swapped="yes"/>
               </object>
             </child>
-
           </object>
         </child>
       </object>