diff --git a/lib/constants.dart b/lib/constants.dart
index 440b18ec7..d335ed570 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 // This version must be updated in tandem with the pubspec version.
-const String kAppVersion = '2.0.1';
+const String kAppVersion = '2.0.0';
 const String kSiteUrl = 'https://invoiceninja.com';
 const String kAppUrl = 'https://staging.invoicing.co';
 const String kAppPlansURL =
diff --git a/lib/ui/user/edit/user_edit_vm.dart b/lib/ui/user/edit/user_edit_vm.dart
index 6cc1eaf09..675f0aa7c 100644
--- a/lib/ui/user/edit/user_edit_vm.dart
+++ b/lib/ui/user/edit/user_edit_vm.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
+import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
 import 'package:invoiceninja_flutter/ui/user/user_screen.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
@@ -16,7 +17,7 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 
 class UserEditScreen extends StatelessWidget {
   const UserEditScreen({Key key}) : super(key: key);
-  static const String route = '/user/edit';
+  static const String route = '/$kSettings/$kSettingsUserManagementEdit';
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/ui/user/user_screen.dart b/lib/ui/user/user_screen.dart
index f0a9c007a..d517fe890 100644
--- a/lib/ui/user/user_screen.dart
+++ b/lib/ui/user/user_screen.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
+import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/ui/app/app_scaffold.dart';
 import 'package:invoiceninja_flutter/data/models/user_model.dart';
 import 'package:invoiceninja_flutter/ui/app/list_filter.dart';
@@ -19,7 +20,7 @@ class UserScreen extends StatelessWidget {
     @required this.viewModel,
   }) : super(key: key);
 
-  static const String route = '/user';
+  static const String route = '/$kSettings';
 
   final UserScreenVM viewModel;
 
diff --git a/lib/ui/user/view/user_view_vm.dart b/lib/ui/user/view/user_view_vm.dart
index f4c251afd..91fcb69cb 100644
--- a/lib/ui/user/view/user_view_vm.dart
+++ b/lib/ui/user/view/user_view_vm.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/ui/app/snackbar_row.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -16,7 +17,7 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 
 class UserViewScreen extends StatelessWidget {
   const UserViewScreen({Key key}) : super(key: key);
-  static const String route = '/user/view';
+  static const String route = '/$kSettings/$kSettingsUserManagementView';
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index 62711cc90..f2b8c2e64 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -14,6 +14,7 @@ abstract class LocaleCodeAware {
 mixin LocalizationsProvider on LocaleCodeAware {
   static final Map<String, Map<String, String>> _localizedValues = {
     'en': {
+      'user_management': 'User Management',
       'users': 'Users',
       'new_user': 'New User',
       'edit_user': 'Edit User',
@@ -15392,6 +15393,8 @@ mixin LocalizationsProvider on LocaleCodeAware {
 
   String get users => _localizedValues[localeCode]['users'];
 
+  String get userManagement => _localizedValues[localeCode]['user_management'];
+
   String lookup(String key) {
     final lookupKey = toSnakeCase(key);
     return _localizedValues[localeCode][lookupKey] ??