4 files changed, 25 insertions, 19 deletions

diff --git a/README.md b/README.md
index a25f058f8..a1198019c 100644
--- a/README.md
+++ b/README.md
@@ -154,6 +154,10 @@ Finally, run the server with the `production` `NODE_ENV` variable set.
 
     $ NODE_ENV=production npm start
 
+The administrator password is automatically generated and can be found in the logs. You can set another password with:
+
+    $ NODE_ENV=production npm run reset-password -- -u root
+
 **Nginx template** (reverse proxy): https://github.com/Chocobozzz/PeerTube/tree/master/support/nginx
 
 **Systemd template**: https://github.com/Chocobozzz/PeerTube/tree/master/support/systemd
@@ -176,6 +180,8 @@ In this mode, the server will run requests between pods more quickly, the videos
 
     $ npm run dev
 
+The administrator password is displayed in the command output and can be found in the logs.
+
 ### Test with 3 fresh nodes
 
     $ npm run clean:server:test
diff --git a/package.json b/package.json
index 010934a71..5a9e943c3 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "danger:clean:dev": "scripty",
     "danger:clean:prod": "scripty",
     "danger:clean:modules": "scripty",
+    "reset-password": "scripty",
     "play": "scripty",
     "dev": "scripty",
     "start": "node server",
diff --git a/scripts/help.sh b/scripts/help.sh
index 23c460afa..bf4a51279 100755
--- a/scripts/help.sh
+++ b/scripts/help.sh
@@ -2,20 +2,21 @@
 
 printf "############# PeerTube help #############\n\n"
 printf "npm run ...\n"
-printf "  build                -> Build the application for production (alias of build:client:prod)\n"
-printf "  build:client:dev     -> Build the client for development\n"
-printf "  build:client:prod    -> Build the client for production\n"
-printf "  clean                -> Clean the application\n"
-printf "  clean:client         -> Clean the client build files (dist directory)\n"
-printf "  clean:server:test    -> Clean certificates, logs, uploads and database of the test instances\n"
-printf "  watch:client         -> Watch the client files\n"
-printf "  danger:clean:dev     -> /!\ Clean certificates, logs, uploads, thumbnails, torrents and database specified in the development environment\n"
-printf "  danger:clean:prod    -> /!\ Clean certificates, logs, uploads, thumbnails, torrents and database specified by the production environment\n"
-printf "  danger:clean:modules -> /!\ Clean node and typescript modules\n"
-printf "  play                 -> Run 3 fresh nodes so that you can test the communication between them\n"
-printf "  dev                  -> Watch, run the livereload and run the server so that you can develop the application\n"
-printf "  start                -> Run the server\n"
-printf "  check                -> Check the server (according to NODE_ENV)\n"
-printf "  upgrade -- [branch]  -> Upgrade the application according to the [branch] parameter\n"
-printf "  test                 -> Run the tests\n"
-printf "  help                 -> Print this help\n"
+printf "  build                       -> Build the application for production (alias of build:client:prod)\n"
+printf "  build:client:dev            -> Build the client for development\n"
+printf "  build:client:prod           -> Build the client for production\n"
+printf "  clean                       -> Clean the application\n"
+printf "  clean:client                -> Clean the client build files (dist directory)\n"
+printf "  clean:server:test           -> Clean certificates, logs, uploads and database of the test instances\n"
+printf "  watch:client                -> Watch the client files\n"
+printf "  danger:clean:dev            -> /!\ Clean certificates, logs, uploads, thumbnails, torrents and database specified in the development environment\n"
+printf "  danger:clean:prod           -> /!\ Clean certificates, logs, uploads, thumbnails, torrents and database specified by the production environment\n"
+printf "  danger:clean:modules        -> /!\ Clean node and typescript modules\n"
+printf "  play                        -> Run 3 fresh nodes so that you can test the communication between them\n"
+printf "  reset-password -- -u [user] -> Reset the password of user [user]\n",
+printf "  dev                         -> Watch, run the livereload and run the server so that you can develop the application\n"
+printf "  start                       -> Run the server\n"
+printf "  check                       -> Check the server (according to NODE_ENV)\n"
+printf "  upgrade -- [branch]         -> Upgrade the application according to the [branch] parameter\n"
+printf "  test                        -> Run the tests\n"
+printf "  help                        -> Print this help\n"
diff --git a/scripts/reset-password.js b/scripts/reset-password.js
index 5ae3af9ea..49a481a18 100755
--- a/scripts/reset-password.js
+++ b/scripts/reset-password.js
@@ -2,8 +2,6 @@
 
 'use strict'
 
-// TODO: document this script
-
 const program = require('commander')
 
 const db = require('../server/initializers/database')