diff --git a/docker/types/containers.py b/docker/types/containers.py
index e7841bcb..9dfea8ce 100644
--- a/docker/types/containers.py
+++ b/docker/types/containers.py
@@ -578,7 +578,7 @@ class ContainerConfig(dict):
             'Hostname': hostname,
             'Domainname': domainname,
             'ExposedPorts': ports,
-            'User': six.text_type(user) if user else None,
+            'User': six.text_type(user) if user is not None else None,
             'Tty': tty,
             'OpenStdin': stdin_open,
             'StdinOnce': stdin_once,
diff --git a/tests/unit/types_containers_test.py b/tests/unit/types_containers_test.py
new file mode 100644
index 00000000..b0ad0a71
--- /dev/null
+++ b/tests/unit/types_containers_test.py
@@ -0,0 +1,6 @@
+from docker.types.containers import ContainerConfig
+
+
+def test_uid_0_is_not_elided():
+    x = ContainerConfig(image='i', version='v', command='true', user=0)
+    assert x['User'] == '0'