diff --git a/lib/ui/settings/account_management.dart b/lib/ui/settings/account_management.dart
index 7d1485a68..9b6c4c632 100644
--- a/lib/ui/settings/account_management.dart
+++ b/lib/ui/settings/account_management.dart
@@ -76,55 +76,6 @@ class _AccountManagementState extends State<AccountManagement>
           ListView(
             children: <Widget>[
               SizedBox(height: 14),
-              //if (isSelfHosted(context))
-              //if (false)
-              Padding(
-                padding: const EdgeInsets.all(14),
-                child: Row(
-                  children: <Widget>[
-                    Expanded(
-                      child: ElevatedButton(
-                        label: localization.purchaseLicense,
-                        iconData: Icons.cloud_download,
-                        onPressed: () async {
-                          if (await canLaunch(kWhiteLabelUrl)) {
-                            launch(kWhiteLabelUrl, forceSafariVC: false);
-                          }
-                        },
-                      ),
-                    ),
-                    SizedBox(width: 14),
-                    Expanded(
-                      child: ElevatedButton(
-                        label: localization.applyLicense,
-                        iconData: Icons.cloud_done,
-                        onPressed: () {
-                          fieldCallback(
-                              context: context,
-                              title: localization.applyLicense,
-                              field: localization.license,
-                              maxLength: 24,
-                              callback: (value) {
-                                final state = viewModel.state;
-                                final credentials = state.credentials;
-                                final url = formatApiUrl(credentials.url) +
-                                    '/claim_license?license_key=$value';
-                                WebClient().post(
-                                  url,
-                                  credentials.token,
-                                ).then((dynamic response) {
-                                  viewModel.onAppliedLicense();
-                                }).catchError((dynamic error) {
-                                  showErrorDialog(
-                                      context: context, message: '$error');
-                                });
-                              });
-                        },
-                      ),
-                    ),
-                  ],
-                ),
-              ),
               /*
               Padding(
                 padding: const EdgeInsets.all(16),
@@ -147,6 +98,53 @@ class _AccountManagementState extends State<AccountManagement>
                 ),
               ),              
                */
+              Padding(
+                padding: const EdgeInsets.all(16),
+                child: ElevatedButton(
+                  label: localization.purchaseLicense,
+                  iconData: Icons.cloud_download,
+                  onPressed: () async {
+                    if (await canLaunch(kWhiteLabelUrl)) {
+                      launch(kWhiteLabelUrl, forceSafariVC: false);
+                    }
+                  },
+                ),
+              ),
+              Padding(
+                padding: const EdgeInsets.all(16),
+                child: ElevatedButton(
+                  label: localization.applyLicense,
+                  iconData: Icons.cloud_done,
+                  onPressed: () {
+                    fieldCallback(
+                        context: context,
+                        title: localization.applyLicense,
+                        field: localization.license,
+                        maxLength: 24,
+                        callback: (value) {
+                          final state = viewModel.state;
+                          final credentials = state.credentials;
+                          final url = formatApiUrl(credentials.url) +
+                              '/claim_license?license_key=$value';
+                          WebClient()
+                              .post(
+                            url,
+                            credentials.token,
+                          )
+                              .then((dynamic response) {
+                            viewModel.onAppliedLicense();
+                          }).catchError((dynamic error) {
+                            showErrorDialog(
+                                context: context, message: '$error');
+                          });
+                        });
+                  },
+                ),
+              ),
+              Padding(
+                padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 16),
+                child: Divider(),
+              ),
               Padding(
                 padding: const EdgeInsets.all(16),
                 child: ElevatedButton(