diff --git a/README.md b/README.md
index 03a2cc2..214168a 100644
--- a/README.md
+++ b/README.md
@@ -528,7 +528,7 @@ It's based on the `vendor/bin/behat -di @cms` output.
 
 	Given /^I should see a log-in form$/
 
-	 Then /^I will see a bad log-in message$/
+	 Then /^I will see a "bad" log-in message$/
 
 ### CMS UI
 
diff --git a/src/SilverStripe/BehatExtension/Context/LoginContext.php b/src/SilverStripe/BehatExtension/Context/LoginContext.php
index 27ee175..f9be352 100644
--- a/src/SilverStripe/BehatExtension/Context/LoginContext.php
+++ b/src/SilverStripe/BehatExtension/Context/LoginContext.php
@@ -147,21 +147,18 @@ class LoginContext extends BehatContext
     public function stepIShouldSeeALogInForm()
     {
         $page = $this->getSession()->getPage();
-
         $loginForm = $page->find('css', '#MemberLoginForm_LoginForm');
         assertNotNull($loginForm, 'I should see a log-in form');
     }
 
     /**
-     * @Then /^I will see a bad log-in message$/
+     * @Then /^I will see a "([^"]*)" log-in message$/
      */
-    public function stepIWillSeeABadLogInMessage()
+    public function stepIWillSeeALogInMessage($type)
     {
         $page = $this->getSession()->getPage();
-
-        $badMessage = $page->find('css', '.message.bad');
-
-        assertNotNull($badMessage, 'Bad message not found.');
+        $message = $page->find('css', sprintf('.message.%s', $type));
+        assertNotNull($message, sprintf('%s message not found.', $type));
     }
 
     /**