diff --git a/gpassgen.sh b/gpassgen.sh
index 623dc12..77dd5dd 100755
--- a/gpassgen.sh
+++ b/gpassgen.sh
@@ -27,8 +27,6 @@ function checkexit {
   if [ $1 = 1 ]; then exit 1; fi
 }
 
-cd "$(dirname "$(readlink -f "$0")")"
-
 if [ $(zenity --question --cancel-label "More options" --ok-label "Close" --text "$(apg -m 16 -M NCL -a 1)" --title "Generated Passwords"; echo $?) == 1 ]; then
   
   # More options requested
@@ -61,10 +59,10 @@ if [ $(zenity --question --cancel-label "More options" --ok-label "Close" --text
   
   # Set defaults if no entry was given
   if [ "$PLEN" == "" ]; then
-    PLEN="12"
+    PLEN="16"
   fi
   if [ "$PALG" == "" ]; then
-    PLEN="1"
+    PALG="1"
   fi
   if [ "$POPT" == "" ]; then
     POPT="NCL"