diff --git a/src/common/context.rs b/src/common/context.rs
index 637f1ecb9..abe9b1e4a 100644
--- a/src/common/context.rs
+++ b/src/common/context.rs
@@ -86,6 +86,8 @@ impl Context {
             })?
         };
 
+        let prompt = sudo_options.prompt.or_else(|| env::var("SUDO_PROMPT").ok());
+
         Ok(Context {
             hostname,
             command,
@@ -97,7 +99,7 @@ impl Context {
             chdir: sudo_options.chdir,
             stdin: sudo_options.stdin,
             bell: sudo_options.bell,
-            prompt: sudo_options.prompt,
+            prompt,
             non_interactive: sudo_options.non_interactive,
             process: Process::new(),
             use_pty: true,
diff --git a/src/pam/mod.rs b/src/pam/mod.rs
index fb61f5e6c..5431dca59 100644
--- a/src/pam/mod.rs
+++ b/src/pam/mod.rs
@@ -76,10 +76,7 @@ impl PamContext {
             converser,
             converser_name: converser_name.to_owned(),
             no_interact,
-            auth_prompt: std::env::var("SUDO_PROMPT")
-                .ok()
-                .filter(|s| !s.is_empty())
-                .or(Some("authenticate".to_owned())),
+            auth_prompt: Some("authenticate".to_owned()),
             timed_out: false,
             panicked: false,
         }));