diff --git a/Dockerfile b/Dockerfile
index 296c237..d46ea50 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
 FROM openjdk:8-jre
 
-MAINTAINER PlusMinus <piddlpiddl@gmail.com>
-
+MAINTAINER GoToFoo <admin@gotofoo.eu>
 
 # Create directory, downloader JD" and start JD2 for the initial update and creation of config files.
 RUN \
@@ -9,10 +8,8 @@ RUN \
 	wget -O /opt/JDownloader/JDownloader.jar --user-agent="https://hub.docker.com/r/plusminus/jdownloader2-headless/" --progress=bar:force http://installer.jdownloader.org/JDownloader.jar && \
 	java -Djava.awt.headless=true -jar /opt/JDownloader/JDownloader.jar
 
-
 COPY startJD2.sh /opt/JDownloader/
 RUN chmod +x /opt/JDownloader/startJD2.sh
 
-
 # Run this when the container is started
 CMD /opt/JDownloader/startJD2.sh
diff --git a/startJD2.sh b/startJD2.sh
index 99c32c9..790f1fe 100755
--- a/startJD2.sh
+++ b/startJD2.sh
@@ -7,11 +7,30 @@ function stopJD2 {
 	exit
 }
 
+if [ "$GID" ]
+then
+	GROUP=jdownloader
+	groupadd -g $GID $GROUP
+else
+	GROUP=root
+fi
+
+if [ "$UID" ] 
+then
+	USER=jdownloader
+	useradd -r -s /bin/false -u $UID -g $GROUP $USER
+	chown -R $USER:$GROUP /opt/JDownloader
+else
+	USER=root
+fi
+
 trap stopJD2 EXIT
 
-java -Djava.awt.headless=true -jar /opt/JDownloader/JDownloader.jar &
+su -c "java -Djava.awt.headless=true -jar /opt/JDownloader/JDownloader.jar" -s /bin/bash $USER
 
-while true; do
-	sleep inf
-done
+#java -Djava.awt.headless=true -jar /opt/JDownloader/JDownloader.jar &
+
+#while true; do
+#	sleep inf
+#done