diff --git a/docs/setup.rst b/docs/setup.rst
index e5d4f3b4a..e98be5dca 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -92,10 +92,7 @@ file.
    can use ``pwgen 32 -1`` to generate random string).
 
 2. By default we create an admin user with the password "admin". You
-   need to change the password:
-
-   -  ``cd /opt/redash/current``
-   -  ``sudo -u redash bin/run ./manage.py users password admin {new password}``
+   can change this password at: ``/users/me#password``.
 
 3. If you want to use Google OAuth to authenticate users, you need to
    create a Google Developers project (see :doc:`instructions </misc/google_developers_project>`)
@@ -116,11 +113,11 @@ file.
 
 5. Once you have Google OAuth enabled, you can login using your Google
    Apps account. If you want to grant admin permissions to some users,
-   you can do it with the ``users grant_admin`` command:
-   ``sudo -u redash bin/run ./manage.py users grant_admin {email}``.
+   you can do this by editing the user profile and enabling admin
+   permission for it.
 
 6. If you don't use Google OAuth or just need username/password logins,
-   you can create additional users using the CLI (see :doc:`documentation </usage/users>`).
+   you can create additional users at: ``/users/new``.
 
 Datasources
 -----------
@@ -128,10 +125,8 @@ Datasources
 To make re:dash truly useful, you need to setup your data sources in it. Browse to ``/data_sources`` on your instance,
 to create new data source connection.
 
-See
-:doc:`documentation </datasources>`
-for the different options. Your instance comes ready with dependencies
-needed to setup supported sources.
+See :doc:`documentation </datasources>` for the different options.
+Your instance comes ready with dependencies needed to setup supported sources.
 
 How to upgrade?
 ---------------
diff --git a/docs/usage.rst b/docs/usage.rst
index 5aac023ac..3b13b60b8 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -6,7 +6,6 @@ Usage
     :glob:
 
     usage/maintenance.rst
-    usage/users.rst
     usage/*
 
 
diff --git a/docs/usage/users.rst b/docs/usage/users.rst
deleted file mode 100644
index b6e0df408..000000000
--- a/docs/usage/users.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-Users' Management
-#################
-
-If you use Google OpenID authentication, then each user from the domains
-you allowed will automatically be logged in and have the default
-permissions.
-
-If you want to give some user different permissions or you want to
-create password based users (make sure you enabled this options in
-settings first), you need to use the CLI (``manage.py``).
-
-Create a new user
-=================
-
-.. code:: bash
-
-    $ bin/run ./manage.py users create --help
-    usage: users create [-h] [--permissions PERMISSIONS] [--password PASSWORD]
-                        [--google] [--admin]
-                        name email
-
-    positional arguments:
-      name                  User's full name
-      email                 User's email
-
-    optional arguments:
-      -h, --help            show this help message and exit
-      --permissions PERMISSIONS
-                            Comma seperated list of permissions (leave blank for
-                            default).
-      --password PASSWORD   Password for users who don't use Google Auth (leave
-                            blank for prompt).
-      --google              user uses Google Auth to login
-      --admin               set user as admin
-
-Grant admin permissions
-=======================
-
-``sudo -u redash bin/run ./manage.py users grant_admin {email}``
diff --git a/rd_ui/app/scripts/directives/directives.js b/rd_ui/app/scripts/directives/directives.js
index 6e9348884..4583ed335 100644
--- a/rd_ui/app/scripts/directives/directives.js
+++ b/rd_ui/app/scripts/directives/directives.js
@@ -274,7 +274,7 @@
   directives.directive('inputErrors', function () {
     return {
       restrict: "E",
-      templateUrl: "/views/directives/form_errors.html",
+      templateUrl: "/views/directives/input_errors.html",
       replace: true,
       scope: {
         errors: "="
diff --git a/rd_ui/app/views/directives/form_errors.html b/rd_ui/app/views/directives/input_errors.html
similarity index 100%
rename from rd_ui/app/views/directives/form_errors.html
rename to rd_ui/app/views/directives/input_errors.html