diff --git a/sshd/Dockerfile b/sshd/Dockerfile
index 05c7cb9..7f4f07d 100644
--- a/sshd/Dockerfile
+++ b/sshd/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu
-RUN apt-get update && apt-get install -y openssh-server
+RUN apt-get update && apt-get install -y openssh-server rsync
 RUN mkdir /var/run/sshd
 COPY sshd_config /etc/ssh/sshd_config
 COPY docker-entrypoint.sh /
diff --git a/sshd/docker-entrypoint.sh b/sshd/docker-entrypoint.sh
index 6a8bd6b..6dd128c 100644
--- a/sshd/docker-entrypoint.sh
+++ b/sshd/docker-entrypoint.sh
@@ -5,7 +5,19 @@ cleanup() {
 trap cleanup HUP INT QUIT TERM
 
 
+if [[ (! -z "${ADDITIONAL_USER}" ) && ( "${ADDITIONAL_USER}" != "root"  ) ]]; then
+	useradd -m -s /bin/bash $ADDITIONAL_USER
+	if [[ ! -z "${ADDITIONAL_USER_UID}" ]]; then
+		usermod -u $ADDITIONAL_USER_UID $ADDITIONAL_USER
+	fi
+	if [[ ! -z "${ADDITIONAL_USER_GID}" ]]; then
+		groupmod -g $ADDITIONAL_USER_GID $ADDITIONAL_USER
+	fi
+	echo "${ADDITIONAL_USER}:$(cat $ADDITIONAL_USER_PASSWORD_FILE)" | chpasswd
+fi
+
 
 echo "root:$(cat $ROOT_PASSWORD_FILE)" | chpasswd
+usermod -s /bin/bash root
 /usr/sbin/sshd -D
 #exec "$@"