diff --git a/install.sh b/install.sh
index d4481ea..286b8d1 100755
--- a/install.sh
+++ b/install.sh
@@ -141,7 +141,7 @@ if [[ "$DO_WEBGUI" =~ ^[Yy]$ ]]; then
 fi
 
 # Generirane lozinke
-POSTGRES_PASS=$(tr -dc 'A-Za-z0-9' </dev/urandom | head -c 32)
+POSTGRES_PASS=$(head -c 512 /dev/urandom | LC_ALL=C tr -dc 'A-Za-z0-9' | cut -c1-32)
 SECRET_KEY=$(openssl rand -hex 32)
 GUI_SECRET=$(openssl rand -hex 32)
 
@@ -304,7 +304,7 @@ services:
       GUACD_HOSTNAME: guacd
       POSTGRESQL_HOSTNAME: postgres
       POSTGRESQL_DATABASE: guacamole_db
-      POSTGRESQL_USERNAME: guacamole_user
+      POSTGRESQL_USER: guacamole_user
       POSTGRESQL_PASSWORD: \${POSTGRES_PASS}
     volumes:
       - ./extensions:/etc/guacamole/extensions:ro