diff --git a/docker/README.md b/docker/README.md
index 7ecfb499b..e98aa2b4b 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -121,6 +121,7 @@ You can specify the following environment variables when issuing `docker run` co
 | `SAMPLE_DATA` | string |  _see comment_ | File with sample data to load. Default `data.json` when resetting or generating new DB, none when upgrading. Use `-` to disable |
 | `SMTP_DOMAINS` | string |  | White list of email domains; when non-empty, accept registrations with emails from these domains only (email verification). |
 | `SMTP_HOST_URL` | string | `'http://localhost:6060/'` | URL of the host where the webapp is running (email verification). |
+| `SMTP_LOGIN` | string |  | Optional login to use for authentication with the SMTP server (email verification). If login is missing, `addr-spec` part of `SMTP_SENDER` will be used: e.g. if `SMTP_SENDER` is `'"John Doe" <jdoe@example.com>'`, `jdoe@example.com` will be used as login. |
 | `SMTP_PASSWORD` | string |  | Password to use for authentication with the SMTP server (email verification). |
 | `SMTP_PORT` | number |  | Port number of the SMTP server to use for sending verification emails, e.g. `25` or `587`. |
 | `SMTP_SENDER` | string |  | [RFC 5322](https://tools.ietf.org/html/rfc5322) email address to use in the `FROM` field of verification emails and for authentication with the SMTP server, e.g. `'"John Doe" <jdoe@example.com>'`. |
diff --git a/docker/tinode/Dockerfile b/docker/tinode/Dockerfile
index dc857bafc..987549486 100644
--- a/docker/tinode/Dockerfile
+++ b/docker/tinode/Dockerfile
@@ -11,10 +11,10 @@
 
 FROM alpine:latest
 
-ARG VERSION=0.16.1
+ARG VERSION=0.16.2
 ENV VERSION=$VERSION
 
-LABEL maintainer="Gene Sokolov <gene@tinode.co>"
+LABEL maintainer="Tinode Team <info@tinode.co>"
 LABEL name="TinodeChatServer"
 LABEL version=$VERSION
 
diff --git a/docker/tinode/config.template b/docker/tinode/config.template
index 0546977c5..9e2a80d4b 100644
--- a/docker/tinode/config.template
+++ b/docker/tinode/config.template
@@ -75,6 +75,7 @@
 				"host_url": "$SMTP_HOST_URL",
 				"smtp_server": "$SMTP_SERVER",
 				"smtp_port": "$SMTP_PORT",
+				"login": "$SMTP_LOGIN",
 				"sender": "$SMTP_SENDER",
 				"sender_password": "$SMTP_PASSWORD",
 				"validation_body_templ": "./templ/email-validation-body.templ",