diff --git a/exercises/04-setups_and_teardowns.md b/exercises/04-setups_and_teardowns.md
index e814392..cef6a56 100755
--- a/exercises/04-setups_and_teardowns.md
+++ b/exercises/04-setups_and_teardowns.md
@@ -24,8 +24,8 @@ ${PASSWORD} =    mode
 
 Welcome Page Should Be Visible After Successful Login
     Open Browser To Login Page
-    Enter Username    ${USERNAME}
-    Enter Password    ${PASSWORD}
+    Enter Username
+    Enter Password
     Submit Login Form
     Verify That Welcome Page Is Visible
 
@@ -36,12 +36,10 @@ Open Browser To Login Page
     New Page    ${URL}
 
 Enter Username
-    [Arguments]    ${username}
-    Fill Text    id=username_field    ${username}
+    Fill Text    id=username_field    ${USERNAME}
 
 Enter Password
-    [Arguments]    ${password}
-    Fill Secret    id=password_field    ${password}
+    Fill Secret    id=password_field    ${PASSWORD}
 
 Submit Login Form
     Click    id=login_button
diff --git a/exercises/05-negative_testing.md b/exercises/05-negative_testing.md
index 2bd766c..372e2ce 100755
--- a/exercises/05-negative_testing.md
+++ b/exercises/05-negative_testing.md
@@ -23,6 +23,7 @@ After you've finished your list let's start implementing one of those.
 - Copy-paste the `Open Browser To Login Page`, `Enter Username`, `Enter Password`, and `Submit Login Form`
 keywords from `login.robot` into `invalid_login.robot`. Normally we would not copy-paste keywords around;
 we will see later on how to achieve this while keeping ourselves [DRY](https://en.wikipedia.org/wiki/Don%27t_repeat_yourself).
+- Instead of valid creadentials, use one of the invalid combinations you just created.
 - Create a keyword called `Verify That Error Page Is Visible` to check we've landed on the error page.
 
 Run the test with `robot robot/invalid_login.robot` command to verify the results.