diff --git a/roles/includes/get_rand_pass.yml b/roles/includes/get_rand_pass.yml
index e758707..4e1b016 100644
--- a/roles/includes/get_rand_pass.yml
+++ b/roles/includes/get_rand_pass.yml
@@ -75,7 +75,7 @@
 - when:
     - not rand_pass_file_clear.stat.exists
     - not rand_pass_file_enc.stat.exists
-    - rand_pass_file_enc_pbkdf2.stat.exists or rand_pass_new is defined
+    - rand_pass_file_enc_pbkdf2.stat.exists or (rand_pass_new is defined and pass_openssl_pbkdf2.rc == 0)
     - pass_openssl_pbkdf2.rc == 0
     - encryption | default(True)
     - rand_pass_encryption_key is defined
@@ -98,7 +98,7 @@
 # Read the encrypted pass (without PBKDF2)
 - when:
     - not rand_pass_file_clear.stat.exists
-    - rand_pass_file_enc.stat.exists or rand_pass_new is defined
+    - rand_pass_file_enc.stat.exists or (rand_pass_new is defined and pass_openssl_pbkdf2.rc != 0)
     - not rand_pass_file_enc_pbkdf2.stat.exists
     - encryption | default(True)
     - rand_pass_encryption_key is defined
diff --git a/roles/metabase/templates/metabase.service.j2 b/roles/metabase/templates/metabase.service.j2
index fb8c231..aa92476 100644
--- a/roles/metabase/templates/metabase.service.j2
+++ b/roles/metabase/templates/metabase.service.j2
@@ -14,6 +14,7 @@ ExecStart=/usr/bin/java -Djava.net.preferIPv4Stack=true \
 {% endif %}
             -jar {{ metabase_root_dir }}/app/metabase.jar
 SuccessExitStatus=143
+SyslogIdentifier=metabase
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full