diff --git a/platypush/plugins/google/__init__.py b/platypush/plugins/google/__init__.py
index b904a91a7e..d6d8334a07 100644
--- a/platypush/plugins/google/__init__.py
+++ b/platypush/plugins/google/__init__.py
@@ -50,8 +50,7 @@ class GooglePlugin(Plugin):
                   mkdir -p <WORKDIR>/credentials/google
                   python -m platypush.plugins.google.credentials \
                       'calendar.readonly,gmail.modify' \
-                      [--noauth_local_webserver] \
-                      <WORKDIR>/credentials/google/client_secret.json
+                      <WORKDIR>/credentials/google/client_secret.json [--noauth_local_webserver]
 
            When launched with ``--noauth_local_webserver``, the script will
            start a local webserver and print a URL that should be opened in
diff --git a/platypush/plugins/google/calendar/__init__.py b/platypush/plugins/google/calendar/__init__.py
index 03296f3466..4f06e15389 100644
--- a/platypush/plugins/google/calendar/__init__.py
+++ b/platypush/plugins/google/calendar/__init__.py
@@ -49,8 +49,7 @@ class GoogleCalendarPlugin(GooglePlugin, CalendarInterface):
                   mkdir -p <WORKDIR>/credentials/google
                   python -m platypush.plugins.google.credentials \
                       'calendar.readonly' \
-                      [--noauth_local_webserver] \
-                      <WORKDIR>/credentials/google/client_secret.json
+                      <WORKDIR>/credentials/google/client_secret.json [--noauth_local_webserver]
 
            When launched with ``--noauth_local_webserver``, the script will
            start a local webserver and print a URL that should be opened in
diff --git a/platypush/plugins/google/drive/__init__.py b/platypush/plugins/google/drive/__init__.py
index bf57c369a1..0d53af6f2c 100644
--- a/platypush/plugins/google/drive/__init__.py
+++ b/platypush/plugins/google/drive/__init__.py
@@ -49,8 +49,7 @@ class GoogleDrivePlugin(GooglePlugin):
                   mkdir -p <WORKDIR>/credentials/google
                   python -m platypush.plugins.google.credentials \
                       'drive,drive.appfolder,drive.photos.readonly' \
-                      [--noauth_local_webserver] \
-                      <WORKDIR>/credentials/google/client_secret.json
+                      <WORKDIR>/credentials/google/client_secret.json [--noauth_local_webserver]
 
            When launched with ``--noauth_local_webserver``, the script will
            start a local webserver and print a URL that should be opened in
diff --git a/platypush/plugins/google/fit/__init__.py b/platypush/plugins/google/fit/__init__.py
index 93d414b16c..857c535440 100644
--- a/platypush/plugins/google/fit/__init__.py
+++ b/platypush/plugins/google/fit/__init__.py
@@ -59,8 +59,7 @@ class GoogleFitPlugin(GooglePlugin, RunnablePlugin):
                   fitness.location.read
                   "
                   $ python -m platypush.plugins.google.credentials "$roles" \
-                      [--noauth_local_webserver] \
-                      <WORKDIR>/credentials/google/client_secret.json
+                      <WORKDIR>/credentials/google/client_secret.json [--noauth_local_webserver]
 
            When launched with ``--noauth_local_webserver``, the script will
            start a local webserver and print a URL that should be opened in
diff --git a/platypush/plugins/google/mail/__init__.py b/platypush/plugins/google/mail/__init__.py
index eb9cc8d0d3..c713ee84a9 100644
--- a/platypush/plugins/google/mail/__init__.py
+++ b/platypush/plugins/google/mail/__init__.py
@@ -58,8 +58,7 @@ class GoogleMailPlugin(GooglePlugin):
                   mkdir -p <WORKDIR>/credentials/google
                   python -m platypush.plugins.google.credentials \
                       'gmail.modify' \
-                      [--noauth_local_webserver] \
-                      <WORKDIR>/credentials/google/client_secret.json
+                      <WORKDIR>/credentials/google/client_secret.json [--noauth_local_webserver]
 
            When launched with ``--noauth_local_webserver``, the script will
            start a local webserver and print a URL that should be opened in