diff --git a/src/freedombone-app-babybuddy b/src/freedombone-app-babybuddy
index 3bd30c02dd6ceed33b618c720d9bcff9e52fea8d..37d353509da9c35ae0ce75c11991c99ddd9cf4ec 100755
--- a/src/freedombone-app-babybuddy
+++ b/src/freedombone-app-babybuddy
@@ -42,10 +42,10 @@ BABYBUDDY_DESCRIPTION=
 BABYBUDDY_MOBILE_APP_URL=
 
 babybuddy_variables=(ONION_ONLY
-                       BABYBUDDY_DOMAIN_NAME
-                       BABYBUDDY_CODE
-                       DDNS_PROVIDER
-                       MY_USERNAME)
+                     BABYBUDDY_DOMAIN_NAME
+                     BABYBUDDY_CODE
+                     DDNS_PROVIDER
+                     MY_USERNAME)
 
 function logging_on_babybuddy {
     echo -n ''
@@ -107,13 +107,13 @@ function configure_interactive_babybuddy {
         selection=$(dialog --backtitle $"Freedombone Administrator Control Panel" --title $"babybuddy" --menu $"Choose an operation, or ESC for main menu:" 14 70 3 "${W[@]}" 3>&2 2>&1 1>&3)
 
         if [ ! "$selection" ]; then
-           break
+            break
         fi
         case $selection in
             1) # call some function for option 1
-               ;;
+            ;;
             2) # call some function for option 2
-               ;;
+            ;;
         esac
     done
 }
@@ -383,7 +383,11 @@ function install_babybuddy {
     babybuddy_nginx_site=/etc/nginx/sites-available/$BABYBUDDY_DOMAIN_NAME
     if [[ "$ONION_ONLY" == "no" ]]; then
         nginx_http_redirect "$BABYBUDDY_DOMAIN_NAME" "index index.html"
-        { echo 'server {';
+        { echo 'upstream babybuddy {';
+          echo '    server unix:///var/run/uwsgi/app/babybuddy/socket;';
+          echo '}';
+          echo '';
+          echo 'server {';
           echo '  listen 443 ssl;';
           echo '  #listen [::]:443 ssl;';
           echo "  server_name $BABYBUDDY_DOMAIN_NAME;";
@@ -402,7 +406,7 @@ function install_babybuddy {
           echo '';
           echo "    root /var/www/$BABYBUDDY_DOMAIN_NAME/htdocs;";
           echo '';
-        echo '  index index.html;';
+          echo '  index index.html;';
           echo '  # Location';
           echo '  location / {'; } >> "$babybuddy_nginx_site"
         nginx_limits "$BABYBUDDY_DOMAIN_NAME" '15m'
@@ -411,7 +415,10 @@ function install_babybuddy {
           echo '  }';
           echo '}'; } >> "$babybuddy_nginx_site"
     else
-        echo -n '' > "$babybuddy_nginx_site"
+        { echo 'upstream babybuddy {';
+          echo '    server unix:///var/run/uwsgi/app/babybuddy/socket;';
+          echo '}';
+          echo ''; } > "$babybuddy_nginx_site"
     fi
     { echo 'server {';
       echo "    listen 127.0.0.1:$BABYBUDDY_ONION_PORT default_server;";
@@ -426,7 +433,7 @@ function install_babybuddy {
       echo '';
       echo "    root /var/www/$BABYBUDDY_DOMAIN_NAME/htdocs;";
       echo '';
-        echo '  index index.html;';
+      echo '  index index.html;';
       echo '  # Location';
       echo '  location / {'; } >> "$babybuddy_nginx_site"
     nginx_limits "$BABYBUDDY_DOMAIN_NAME" '15m'