diff --git a/src/config.rs b/src/config.rs
index 1484649..97d7684 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -27,7 +27,7 @@ impl Into<Config> for EnvConfig {
             device: self.device.into(),
             mapper_name: self.mapper_name,
             password_helper: PasswordHelper::Script(self.password_helper),
-            input_salt: if PathBuf::from(&self.salt).exists() {
+            input_salt: if PathBuf::from(&self.salt).exists() && &self.salt != "Ask" {
                 InputSalt::File {
                     path: self.salt.into(),
                 }
@@ -135,7 +135,7 @@ pub enum PasswordHelper {
 
 impl Default for PasswordHelper {
     fn default() -> Self {
-        PasswordHelper::Script("plymouth ask-for-password".into())
+        PasswordHelper::Script("/usr/bin/systemd-ask-password --no-tty 'Please enter second factor for LUKS disk encryption!'".into())
     }
 }
 
diff --git a/src/main.rs b/src/main.rs
index 103fe3b..9774fe5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -105,7 +105,7 @@ fn main() -> Fido2LuksResult<()> {
         }
     } else {
         match args.first().map(|s| s.as_ref()).unwrap() {
-            "addkey" => add_key_to_luks(&Config::load_default_location()?).map(|_| ()),
+            "addkey" => add_key_to_luks(&conf).map(|_| ()),
             "setup" => setup(),
             "open" if args.get(1).map(|a| &*a == "-e").unwrap_or(false) => open(
                 &envy::prefixed("FIDO2LUKS_")