diff --git a/README.md b/README.md
index e0b4d37..96398be 100644
--- a/README.md
+++ b/README.md
@@ -18,3 +18,9 @@ to lose sight of that, I recommend using a local folder for the volume.
     sudo docker run -d -p 8080:8080 -v $(pwd)/.tiddlywiki:/var/lib/tiddlywiki mazzolino/tiddlywiki
 
 In this example, the folder `$(pwd)/.tiddlywiki` is used for the data.
+
+# Auth
+
+Default auth is `user` / `wiki`
+
+Simply provide the USERNAME and PASSWORD env variables to customise.
diff --git a/init-and-run-wiki b/init-and-run-wiki
index b43bf23..6d53175 100755
--- a/init-and-run-wiki
+++ b/init-and-run-wiki
@@ -5,4 +5,5 @@ if [ ! -d /var/lib/tiddlywiki/mywiki ]; then
   tiddlywiki mywiki --init server
 fi
 
-exec tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html user "" 0.0.0.0
+exec tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html ${USERNAME:-user} ${PASSWORD:-'wiki'} 0.0.0.0
+