diff --git a/lib/main.dart b/lib/main.dart
index a4699d90a..b0fbd8a47 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -30,41 +30,6 @@ import 'package:invoiceninja_flutter/ui/app/main_screen.dart';
 import 'package:invoiceninja_flutter/ui/app/screen_imports.dart';
 import 'package:invoiceninja_flutter/ui/auth/init_screen.dart';
 import 'package:invoiceninja_flutter/ui/auth/login_vm.dart';
-import 'package:invoiceninja_flutter/ui/dashboard/dashboard_vm.dart';
-import 'package:invoiceninja_flutter/ui/document/document_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/expense/expense_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart';
-import 'package:invoiceninja_flutter/ui/group/group_screen.dart';
-import 'package:invoiceninja_flutter/ui/group/group_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/group/view/group_view_vm.dart';
-import 'package:invoiceninja_flutter/ui/invoice/invoice_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/payment/payment_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/product/product_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/project/project_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/quote/quote_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/buy_now_buttons_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/client_portal_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/company_details_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/credit_cards_and_banks_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/data_visualizations_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/device_settings_list_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/email_settings_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/generated_numbers_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/import_export_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/invoice_design_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/custom_fields_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/localization_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/notifications_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/online_payments_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/products_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/tax_rates_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/templates_and_reminders_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/user_details_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/workflow_vm.dart';
-import 'package:invoiceninja_flutter/ui/task/task_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/user/user_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/vendor/vendor_screen_vm.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:redux/redux.dart';
diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index a8cf3069b..472f52a48 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -7,42 +7,6 @@ import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart';
 import 'package:invoiceninja_flutter/ui/app/app_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/help_text.dart';
 import 'package:invoiceninja_flutter/ui/app/screen_imports.dart';
-import 'package:invoiceninja_flutter/ui/client/client_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/company_gateway/company_gateway_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/company_gateway/edit/company_gateway_edit_vm.dart';
-import 'package:invoiceninja_flutter/ui/company_gateway/view/company_gateway_view_vm.dart';
-import 'package:invoiceninja_flutter/ui/dashboard/dashboard_vm.dart';
-import 'package:invoiceninja_flutter/ui/expense/expense_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart';
-import 'package:invoiceninja_flutter/ui/group/group_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/group/view/group_view_vm.dart';
-import 'package:invoiceninja_flutter/ui/invoice/invoice_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/payment/payment_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/product/product_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/project/project_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/quote/quote_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/buy_now_buttons_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/client_portal_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/company_details_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/credit_cards_and_banks_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/data_visualizations_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/device_settings_list_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/email_settings_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/generated_numbers_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/import_export_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/invoice_design_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/custom_fields_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/localization_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/notifications_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/products_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/templates_and_reminders_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/user_details_vm.dart';
-import 'package:invoiceninja_flutter/ui/settings/workflow_vm.dart';
-import 'package:invoiceninja_flutter/ui/task/task_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/tax_rate/edit/tax_rate_edit_vm.dart';
-import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_screen_vm.dart';
-import 'package:invoiceninja_flutter/ui/tax_rate/view/tax_rate_view_vm.dart';
-import 'package:invoiceninja_flutter/ui/vendor/vendor_screen_vm.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:redux/redux.dart';
@@ -243,6 +207,15 @@ class SettingsScreens extends StatelessWidget {
       case kSettingsDataVisualizations:
         screen = DataVisualizationsScreen();
         break;
+      case kSettingsUserManagement:
+        screen = UserScreenBuilder();
+        break;
+      case kSettingsUserManagementView:
+        screen = UserViewScreen();
+        break;
+      case kSettingsUserManagementEdit:
+        screen = UserEditScreen();
+        break;
     }
 
     return Row(children: <Widget>[
diff --git a/lib/ui/app/screen_imports.dart b/lib/ui/app/screen_imports.dart
index f0665ee70..c59bfc584 100644
--- a/lib/ui/app/screen_imports.dart
+++ b/lib/ui/app/screen_imports.dart
@@ -32,3 +32,46 @@ export 'package:invoiceninja_flutter/ui/task/view/task_view_vm.dart';
 export 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_vm.dart';
 export 'package:invoiceninja_flutter/ui/vendor/vendor_screen.dart';
 export 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_vm.dart';
+export 'package:invoiceninja_flutter/ui/client/client_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/company_gateway/company_gateway_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/company_gateway/edit/company_gateway_edit_vm.dart';
+export 'package:invoiceninja_flutter/ui/company_gateway/view/company_gateway_view_vm.dart';
+export 'package:invoiceninja_flutter/ui/dashboard/dashboard_vm.dart';
+export 'package:invoiceninja_flutter/ui/expense/expense_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart';
+export 'package:invoiceninja_flutter/ui/group/group_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/group/view/group_view_vm.dart';
+export 'package:invoiceninja_flutter/ui/invoice/invoice_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/payment/payment_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/product/product_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/project/project_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/quote/quote_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/buy_now_buttons_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/client_portal_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/company_details_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/credit_cards_and_banks_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/data_visualizations_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/device_settings_list_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/email_settings_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/generated_numbers_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/import_export_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/invoice_design_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/custom_fields_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/localization_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/notifications_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/products_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/templates_and_reminders_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/user_details_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/workflow_vm.dart';
+export 'package:invoiceninja_flutter/ui/task/task_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/tax_rate/edit/tax_rate_edit_vm.dart';
+export 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/tax_rate/view/tax_rate_view_vm.dart';
+export 'package:invoiceninja_flutter/ui/user/edit/user_edit_vm.dart';
+export 'package:invoiceninja_flutter/ui/user/user_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/user/view/user_view_vm.dart';
+export 'package:invoiceninja_flutter/ui/vendor/vendor_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/online_payments_vm.dart';
+export 'package:invoiceninja_flutter/ui/settings/tax_rates_vm.dart';
+export 'package:invoiceninja_flutter/ui/document/document_screen_vm.dart';
+export 'package:invoiceninja_flutter/ui/group/group_screen.dart';
diff --git a/lib/ui/settings/settings_list.dart b/lib/ui/settings/settings_list.dart
index 9ea954e3d..50b8166c4 100644
--- a/lib/ui/settings/settings_list.dart
+++ b/lib/ui/settings/settings_list.dart
@@ -175,6 +175,11 @@ class SettingsList extends StatelessWidget {
           icon: FontAwesomeIcons.link,
         ),
          */
+        SettingsListTile(
+          section: kSettingsUserManagement,
+          viewModel: viewModel,
+          icon: FontAwesomeIcons.layerGroup,
+        ),
       ],
     );
   }