diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index 6f15c3aef..3cea9138b 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -10,7 +10,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:flutter_styled_toast/flutter_styled_toast.dart';
 import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart';
-import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
 import 'package:invoiceninja_flutter/ui/app/upgrade_dialog.dart';
 import 'package:invoiceninja_flutter/utils/app_review.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
@@ -384,12 +383,11 @@ class MenuDrawer extends StatelessWidget {
                                     },
                                   ),
                                 ),
-                            if (true ||
-                                state.userCompany.isOwner &&
-                                    state.isHosted &&
-                                    !isPaidAccount(context) &&
-                                    !isApple() &&
-                                    kReleaseMode)
+                            if (state.userCompany.isOwner &&
+                                state.isHosted &&
+                                !isPaidAccount(context) &&
+                                !isApple() &&
+                                kReleaseMode)
                               Material(
                                 child: Tooltip(
                                   message: state.isMenuCollapsed
@@ -397,6 +395,8 @@ class MenuDrawer extends StatelessWidget {
                                       : '',
                                   child: ListTile(
                                     dense: true,
+                                    contentPadding:
+                                        const EdgeInsets.only(left: 12),
                                     tileColor: Colors.green,
                                     leading: IconButton(
                                       onPressed: () => null,
diff --git a/lib/ui/app/upgrade_dialog.dart b/lib/ui/app/upgrade_dialog.dart
index d0d31d756..e0878e80c 100644
--- a/lib/ui/app/upgrade_dialog.dart
+++ b/lib/ui/app/upgrade_dialog.dart
@@ -161,15 +161,16 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
       title: Text(localization.upgrade),
       content: Column(
         children: [
-
           Expanded(child: Stack(children: stack)),
         ],
       ),
       actions: [
         if (!_loading)
-        TextButton(onPressed: () {
-          _inAppPurchase.restorePurchases();
-        }, child: Text(localization.restorePurchases)),
+          TextButton(
+              onPressed: () {
+                _inAppPurchase.restorePurchases();
+              },
+              child: Text(localization.restorePurchases)),
         TextButton(
           child: Text(localization.termsOfService),
           onPressed: () => launch(kTermsOfServiceURL),
@@ -288,17 +289,17 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
 
     final store = StoreProvider.of<AppState>(context);
     final state = store.state;
-    final url = (state.isStaging ? kAppStagingUrl : kAppProductionUrl) + '/admin/subscription';
+    final url = (state.isStaging ? kAppStagingUrl : kAppProductionUrl) +
+        '/admin/subscription';
 
-  /*
-    await WebClient().post(url, state.credentials.token, data: jsonEncode({
-      'inapp_transaction_id': purchaseDetails.purchaseID,
-      'account_id': state.account.id,
-      'plan': '',
-      'plan_term': '',
-      'plan_paid': (int.parse(purchase.transactionDate) / 1000).floor(),
-    }));
-   */
+    await WebClient().post(url, state.credentials.token,
+        data: jsonEncode({
+          'inapp_transaction_id': purchaseDetails.purchaseID,
+          'account_id': state.account.id,
+          'plan': purchaseDetails.productID,
+          'plan_paid':
+              (int.parse(purchaseDetails.transactionDate) / 1000).floor(),
+        }));
   }
 
   void handleError(IAPError error) {