diff --git a/src/applications/passphrase/view/PassphraseCredentialControl.php b/src/applications/passphrase/view/PassphraseCredentialControl.php
index 8ba1ef9bc8..98294832f7 100644
--- a/src/applications/passphrase/view/PassphraseCredentialControl.php
+++ b/src/applications/passphrase/view/PassphraseCredentialControl.php
@@ -50,7 +50,8 @@ final class PassphraseCredentialControl extends AphrontFormControl {
     // credential. Populate it into the menu to allow them to save the form
     // without making any changes.
     $current_phid = $this->getValue();
-    if (strlen($current_phid) && empty($options_map[$current_phid])) {
+    if (phutil_nonempty_string($current_phid) &&
+        empty($options_map[$current_phid])) {
       $viewer = $this->getViewer();
 
       $current_name = null;