diff --git a/elements/dynamic-login/README.rst b/elements/dynamic-login/README.rst
index 0fb198bf..0bb510d2 100644
--- a/elements/dynamic-login/README.rst
+++ b/elements/dynamic-login/README.rst
@@ -27,13 +27,13 @@ rootpwd
   :Description: If the operator append rootpwd="$ENCRYPTED_PASSWORD" to the
                 kernel command line on boot, the helper script will set the
                 root password to the one specified by this option. Note that
-                this password should be **encrypted**. Encrypted passwords
+                this password must be **encrypted**. Encrypted passwords
                 can be generated using the ``openssl`` command, e.g:
                 *openssl passwd -1*.
 
 
 .. note::
-   The value of these parameters should be **quoted**, e.g: sshkey="ssh-rsa
+   The value of these parameters must be **quoted**, e.g: sshkey="ssh-rsa
    BBBA1NBzaC1yc2E ..."
 
 
diff --git a/elements/dynamic-login/init-scripts/systemd/dynamic-login.service b/elements/dynamic-login/init-scripts/systemd/dynamic-login.service
index d83e7bd3..8f7a2cef 100644
--- a/elements/dynamic-login/init-scripts/systemd/dynamic-login.service
+++ b/elements/dynamic-login/init-scripts/systemd/dynamic-login.service
@@ -3,6 +3,7 @@ Description=Dynamic Login
 After=network.target
 
 [Service]
+Type=oneshot
 ExecStart=/usr/local/bin/dynamic-login
 
 [Install]
diff --git a/elements/dynamic-login/static/usr/local/bin/dynamic-login b/elements/dynamic-login/static/usr/local/bin/dynamic-login
index 823ea90c..5f2534a5 100755
--- a/elements/dynamic-login/static/usr/local/bin/dynamic-login
+++ b/elements/dynamic-login/static/usr/local/bin/dynamic-login
@@ -1,5 +1,5 @@
 #!/bin/bash
-# dib-lint: disable=setu sete setpipefail dibdebugtrace
+# dib-lint: disable=dibdebugtrace
 # Copyright 2015 Red Hat, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,6 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+set -eu
+set -o pipefail
+
 # Reads an encrypted root password from the kernel command line and set
 # it to the root user
 if [[ $(</proc/cmdline) =~ rootpwd=\"([^\"]+)\" ]]; then