diff --git a/modules/environment/login/login-inner.nix b/modules/environment/login/login-inner.nix
index 1e09153..6a38a15 100644
--- a/modules/environment/login/login-inner.nix
+++ b/modules/environment/login/login-inner.nix
@@ -10,7 +10,7 @@ in
 writeText "login-inner" ''
   # This file is generated by nix-on-droid. DO NOT EDIT.
 
-  set -e
+  set -eu -o pipefail
 
   [ "$#" -gt 0 ] || echo "Welcome to Nix-on-Droid!"
 
@@ -49,13 +49,13 @@ writeText "login-inner" ''
 
       echo
       echo "Congratulations! Now you have Nix installed with some default packages like bashInteractive, \
-      coreutils, cacert and most important nix-on-droid itself to manage local configuration, see"
+    coreutils, cacert and most important nix-on-droid itself to manage local configuration, see"
       echo "  nix-on-droid help"
       echo "or in the config file"
       echo "  ~/.config/nixpkgs/nix-on-droid.nix"
       echo
       echo "You can go for the bare nix-on-droid setup or you can configure your phone via home-manager. See \
-      config file for further information."
+    config file for further information."
       echo
     fi
   ''}
diff --git a/modules/environment/login/login.nix b/modules/environment/login/login.nix
index a30fe58..6d19864 100644
--- a/modules/environment/login/login.nix
+++ b/modules/environment/login/login.nix
@@ -10,7 +10,7 @@ in
 writeScript "login" ''
   #!/system/bin/sh
   # This file is generated by nix-on-droid. DO NOT EDIT.
-  set -e
+  set -eu -o pipefail
 
   export USER="${config.user.userName}"
   export PROOT_TMP_DIR=${installationDir}/tmp