diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java b/webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java
index 6c7c606af..fd2bf0333 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java
@@ -131,6 +131,7 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter {
         PluginMessages pluginMessages = new PluginMessages(messages, language);
         pluginMessages.setDefaultEncoding("UTF-8");
         pluginMessages.setBasenames("i18n/WebGoatLabels");
+        pluginMessages.setFallbackToSystemLocale(false);
         return pluginMessages;
     }
 
diff --git a/webgoat-lessons/secure-passwords/src/main/resources/html/SecurePasswords.html b/webgoat-lessons/secure-passwords/src/main/resources/html/SecurePasswords.html
index 7878b2155..6f2f579e0 100644
--- a/webgoat-lessons/secure-passwords/src/main/resources/html/SecurePasswords.html
+++ b/webgoat-lessons/secure-passwords/src/main/resources/html/SecurePasswords.html
@@ -26,7 +26,8 @@
             <table>
                 <tr>
                     <td><label>Password</label></td>
-                    <td><input name="password" value="" type="password" placeholder="Enter a secure password"/></td>
+                    <td><input id="myInput" name="password" value="" type="password" placeholder="Enter a secure password"/></td>
+                    <td><input type="checkbox" onclick="javascript:myFunction()"/>Show password</td>
                 </tr>
                 <tr>
                     <td><button type="SUBMIT">Submit</button></td>
@@ -46,4 +47,16 @@
     <div class="adoc-content" th:replace="doc:SecurePasswords_4.adoc"></div>
 </div>
 
+<script>
+function myFunction() {
+  var x = document.getElementById("myInput");
+  if (x.type === "password") {
+    x.type = "text";
+  } else {
+    x.type = "password";
+  }
+}
+</script>
+
+
 </html>
\ No newline at end of file
diff --git a/webgoat-lessons/secure-passwords/src/main/resources/i18n/WebGoatLabels.properties b/webgoat-lessons/secure-passwords/src/main/resources/i18n/WebGoatLabels.properties
index 2e2877bc2..c561bc467 100644
--- a/webgoat-lessons/secure-passwords/src/main/resources/i18n/WebGoatLabels.properties
+++ b/webgoat-lessons/secure-passwords/src/main/resources/i18n/WebGoatLabels.properties
@@ -1,3 +1,4 @@
 secure-passwords.title=Secure Passwords
-securepassword-success=You have succeded! The password is secure enough.
-securepassword-failed=You have failed! Try to enter a secure password.
\ No newline at end of file
+securepassword-success=You have succeeded! The password is secure enough.
+securepassword-failed=You have failed! Try to enter a secure password.
+show-password=Show Password
\ No newline at end of file
diff --git a/webgoat-lessons/secure-passwords/src/main/resources/i18n/WebGoatLabels_nl.properties b/webgoat-lessons/secure-passwords/src/main/resources/i18n/WebGoatLabels_nl.properties
new file mode 100644
index 000000000..5030c4c3b
--- /dev/null
+++ b/webgoat-lessons/secure-passwords/src/main/resources/i18n/WebGoatLabels_nl.properties
@@ -0,0 +1,4 @@
+secure-passwords.title=Veilige wachtwoorden
+securepassword-success=Het is gelukt. Het wachtwoord is sterk genoeg.
+securepassword-failed=Helaas, probeer een sterker wachtwoord!
+show-password=Toon wachtwoord
\ No newline at end of file