diff --git a/src/freedombone-app-radicale b/src/freedombone-app-radicale
index a7758eb2..89ef2d31 100755
--- a/src/freedombone-app-radicale
+++ b/src/freedombone-app-radicale
@@ -63,7 +63,7 @@ function add_user_radicale {
     fi
 
     if ! grep "$new_username:" ${RADICALE_DIRECTORY}/users; then
-        htpasswd -Bb ${RADICALE_DIRECTORY}/users "$new_username" "$new_user_password"
+        htpasswd -bd ${RADICALE_DIRECTORY}/users "$new_username" "$new_user_password"
         systemctl reload radicale
     fi
     echo '0'
@@ -229,11 +229,12 @@ function install_radicale {
     echo '[server]' >  ${RADICALE_DIRECTORY}/config
     echo 'hosts=127.0.0.1:52322' >> ${RADICALE_DIRECTORY}/config
     echo 'ssl = False' >> ${RADICALE_DIRECTORY}/config
+    echo 'daemon = False' >> ${RADICALE_DIRECTORY}/config
     echo '' >> ${RADICALE_DIRECTORY}/config
     echo '[auth]' >>  ${RADICALE_DIRECTORY}/config
     echo 'type = htpasswd' >> ${RADICALE_DIRECTORY}/config
     echo "htpasswd_filename = ${RADICALE_DIRECTORY}/users" >> ${RADICALE_DIRECTORY}/config
-    echo 'htpasswd_encryption = bcrypt' >> ${RADICALE_DIRECTORY}/config
+    echo 'htpasswd_encryption = crypt' >> ${RADICALE_DIRECTORY}/config
     echo '' >> ${RADICALE_DIRECTORY}/config
     echo '[rights]' >> ${RADICALE_DIRECTORY}/config
     echo 'type = owner_only' >> ${RADICALE_DIRECTORY}/config
@@ -254,9 +255,9 @@ function install_radicale {
     if [ ! -f /var/www/radicale ]; then
         mkdir /var/www/radicale
     fi
-    echo 'import radicale' > /var/www/radicale/radicale.py
-    echo 'radicale.log.start()' >> /var/www/radicale/radicale.py
-    echo 'application = radicale.Application()' >> /var/www/radicale/radicale.py
+    #echo 'import radicale' > /var/www/radicale/radicale.py
+    #echo 'radicale.log.start()' >> /var/www/radicale/radicale.py
+    #echo 'application = radicale.Application()' >> /var/www/radicale/radicale.py
 
     #echo '[uwsgi]' > /var/www/radicale/uwsgi.ini
     #echo 'plugins = python' >> /var/www/radicale/uwsgi.ini
@@ -291,13 +292,13 @@ function install_radicale {
     echo '[Unit]' > /etc/systemd/system/radicale.service
     echo 'Description=Radicale CalDAV Server' >> /etc/systemd/system/radicale.service
     echo 'After=network.target' >> /etc/systemd/system/radicale.service
-    echo 'Requires=uwsgi_rundir.service' >> /etc/systemd/system/radicale.service
+    #echo 'Requires=uwsgi_rundir.service' >> /etc/systemd/system/radicale.service
     echo '' >> /etc/systemd/system/radicale.service
     echo '[Service]' >> /etc/systemd/system/radicale.service
     echo 'Type=simple' >> /etc/systemd/system/radicale.service
     echo 'User=www-data' >> /etc/systemd/system/radicale.service
     echo 'Group=www-data' >> /etc/systemd/system/radicale.service
-    echo 'ExecStart=/var/www/radicale/radicale.py' >> /etc/systemd/system/radicale.service
+    echo "ExecStart=/usr/bin/radicale --config ${RADICALE_DIRECTORY}" >> /etc/systemd/system/radicale.service
     echo '' >> /etc/systemd/system/radicale.service
     echo '[Install]' >> /etc/systemd/system/radicale.service
     echo 'WantedBy=multi-user.target' >> /etc/systemd/system/radicale.service
@@ -323,8 +324,9 @@ function install_radicale {
         echo '    error_log /var/log/radicale/radicale.log warn;' >> /etc/nginx/sites-available/radicale
         echo '' >> /etc/nginx/sites-available/radicale
         echo '    location / {' >> /etc/nginx/sites-available/radicale
-        echo '        uwsgi_pass unix:/var/run/uwsgi/radicale.sock;' >> /etc/nginx/sites-available/radicale
-        echo '        include uwsgi_params;' >> /etc/nginx/sites-available/radicale
+        echo '        proxy_pass http://localhost:52322;' >> /etc/nginx/sites-available/radicale
+        #echo '        uwsgi_pass unix:/var/run/uwsgi/radicale.sock;' >> /etc/nginx/sites-available/radicale
+        #echo '        include uwsgi_params;' >> /etc/nginx/sites-available/radicale
         echo '    }' >> /etc/nginx/sites-available/radicale
         echo '}' >> /etc/nginx/sites-available/radicale
         echo '' >> /etc/nginx/sites-available/radicale