diff --git a/development/idp-local/config/authsources.php b/development/idp-local/config/authsources.php
index 71cb48bf..f9fa9ee5 100644
--- a/development/idp-local/config/authsources.php
+++ b/development/idp-local/config/authsources.php
@@ -65,7 +65,7 @@
                 'invalid'
             ],
         ],
-        'no_review:a' => [
+        'no_review:e' => [
             'eduPersonPrincipalName' => ['NO_REVIEW@idp'],
             'eduPersonTargetID' => ['11111111-1111-1111-1111-111111111111'],
             'sn' => ['Review'],
@@ -97,7 +97,7 @@
             ],
             'profile_review' => 'no'
         ],
-        'mfa_add:a' => [
+        'mfa_add:f' => [
             'eduPersonPrincipalName' => ['MFA_ADD@idp'],
             'eduPersonTargetID' => ['22222222-2222-2222-2222-222222222222'],
             'sn' => ['Add'],
@@ -118,7 +118,7 @@
             ],
             'profile_review' => 'no'
         ],
-        'method_add:a' => [
+        'method_add:g' => [
             'eduPersonPrincipalName' => ['METHOD_ADD@methodidp'],
             'eduPersonTargetID' => ['44444444-4444-4444-4444-444444444444'],
             'sn' => ['Add'],
@@ -150,7 +150,7 @@
             ],
             'profile_review' => 'no'
         ],
-        'profile_review:a' => [
+        'profile_review:h' => [
             'eduPersonPrincipalName' => ['METHOD_REVIEW@methodidp'],
             'eduPersonTargetID' => ['55555555-5555-5555-5555-555555555555'],
             'sn' => ['Review'],
diff --git a/features/bootstrap/ProfileReviewContext.php b/features/bootstrap/ProfileReviewContext.php
index 2d0caaee..8e60c0d3 100644
--- a/features/bootstrap/ProfileReviewContext.php
+++ b/features/bootstrap/ProfileReviewContext.php
@@ -151,7 +151,7 @@ public function iProvideCredentialsThatDoNotNeedReview()
     {
         // See `development/idp-local/config/authsources.php` for options.
         $this->username = 'no_review';
-        $this->password = 'a';
+        $this->password = 'e';
     }
 
     /**
@@ -161,7 +161,19 @@ public function iProvideCredentialsThatAreDueForAReminder($category, $nagType)
     {
         // See `development/idp-local/config/authsources.php` for options.
         $this->username = $category . '_' . $nagType;
-        $this->password = 'a';
+        switch ($this->username) {
+            case 'mfa_add':
+                $this->password = 'f';
+                break;
+
+            case 'method_add':
+                $this->password = 'g';
+                break;
+
+            case 'profile_review':
+                $this->password = 'h';
+                break;
+        }
     }
 
     /**
@@ -249,7 +261,7 @@ public function iProvideCredentialsForAUserThatHasUsedTheManagerMfaOption()
     {
         // See `development/idp-local/config/authsources.php` for options.
         $this->username = 'profile_review';
-        $this->password = 'a';
+        $this->password = 'h';
     }
 
     /**