diff --git a/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson10.java b/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson10.java
index 7933d02df..541687dcb 100644
--- a/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson10.java
+++ b/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson10.java
@@ -75,7 +75,7 @@ public class SqlInjectionLesson10 extends AssignmentEndpoint {
                 }
             } catch (SQLException e) {
                 if (tableExists(connection)) {
-                    return failed(this).feedback("sql-injection.error").output("<span class='feedback-negative'>" + e.getMessage() + "</span><br>" + output.toString()).build();
+                    return failed(this).output("<span class='feedback-negative'>" + e.getMessage() + "</span><br>" + output.toString()).build();
                 } else {
                     return success(this).feedback("sql-injection.10.success").build();
                 }
diff --git a/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson8.java b/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson8.java
index 8387e2683..6886d36c0 100644
--- a/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson8.java
+++ b/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson8.java
@@ -87,14 +87,14 @@ public class SqlInjectionLesson8 extends AssignmentEndpoint {
                         return failed(this).feedback("sql-injection.8.no.results").build();
                     }
                 } else {
-                    return failed(this).feedback("sql-injection.error").build();
+                    return failed(this).build();
                 }
             } catch (SQLException e) {
-                return failed(this).feedback("sql-injection.error").output("<br><span class='feedback-negative'>" + e.getMessage() + "</span>").build();
+                return failed(this).output("<br><span class='feedback-negative'>" + e.getMessage() + "</span>").build();
             }
 
         } catch (Exception e) {
-            return failed(this).feedback("sql-injection.error").output("<br><span class='feedback-negative'>" + e.getMessage() + "</span>").build();
+            return failed(this).output("<br><span class='feedback-negative'>" + e.getMessage() + "</span>").build();
         }
     }
 
diff --git a/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson9.java b/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson9.java
index 2fd364281..f994a4d76 100644
--- a/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson9.java
+++ b/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson9.java
@@ -75,14 +75,14 @@ public class SqlInjectionLesson9 extends AssignmentEndpoint {
                 }
             } catch (SQLException e) {
                 System.err.println(e.getMessage());
-                return failed(this).feedback("sql-injection.error").output("<br><span class='feedback-negative'>" + e.getMessage() + "</span>").build();
+                return failed(this).output("<br><span class='feedback-negative'>" + e.getMessage() + "</span>").build();
             }
 
             return checkSalaryRanking(connection, output);
 
         } catch (Exception e) {
             System.err.println(e.getMessage());
-            return failed(this).feedback("sql-injection.error").output("<br><span class='feedback-negative'>" + e.getMessage() + "</span>").build();
+            return failed(this).output("<br><span class='feedback-negative'>" + e.getMessage() + "</span>").build();
         }
     }
 
@@ -103,7 +103,7 @@ public class SqlInjectionLesson9 extends AssignmentEndpoint {
                 }
             }
         } catch (SQLException e) {
-            return failed(this).feedback("sql-injection.error").output("<br><span class='feedback-negative'>" + e.getMessage() + "</span>").build();
+            return failed(this).output("<br><span class='feedback-negative'>" + e.getMessage() + "</span>").build();
         }
     }
 
diff --git a/webgoat-lessons/sql-injection/src/main/resources/i18n/WebGoatLabels.properties b/webgoat-lessons/sql-injection/src/main/resources/i18n/WebGoatLabels.properties
index cd611a432..0419a99e8 100644
--- a/webgoat-lessons/sql-injection/src/main/resources/i18n/WebGoatLabels.properties
+++ b/webgoat-lessons/sql-injection/src/main/resources/i18n/WebGoatLabels.properties
@@ -7,9 +7,8 @@
 SqlInjectionChallenge1=Look at the different response you receive from the server
 SqlInjectionChallenge2=The vulnerability is on the register form
 SqlInjectionChallenge3=Use tooling to automate this attack
-sql-injection.error=<span class='feedback-negative'>Sorry, this solution is not correct. Try again!</span>
-NoResultsMatched=<span class='feedback-negative'>No results matched. Try Again.</span>
-ResultsButNotTom=<span class='feedback-negative'>Try To login as Tom!</span>
+NoResultsMatched=No results matched, try again.
+ResultsButNotTom=Try To login as Tom!
 
 sql-injection.2.success=<span class='feedback-positive'>You have succeeded!</span>
 sql-injection.2.failed=<span class='feedback-negative'>Something went wrong! You got no results, check your SQL Statement and the table above.</span>
diff --git a/webgoat-lessons/sql-injection/src/test/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson8Test.java b/webgoat-lessons/sql-injection/src/test/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson8Test.java
index 2e0b7146c..395f14700 100644
--- a/webgoat-lessons/sql-injection/src/test/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson8Test.java
+++ b/webgoat-lessons/sql-injection/src/test/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson8Test.java
@@ -96,11 +96,6 @@ public class SqlInjectionLesson8Test extends SqlLessonTest {
 
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("lessonCompleted", is(false)))
-                .andExpect(jsonPath("$.feedback", is(modifySpan(messages.getMessage("sql-injection.error")))))
                 .andExpect(jsonPath("$.output", containsString("feedback-negative")));
     }
-
-    public static String modifySpan(String message) {
-        return message.replace("</span>", "<\\/span>");
-    }
 }
\ No newline at end of file
diff --git a/webgoat-lessons/sql-injection/src/test/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson9Test.java b/webgoat-lessons/sql-injection/src/test/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson9Test.java
index 6b7b2d953..b513088f8 100644
--- a/webgoat-lessons/sql-injection/src/test/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson9Test.java
+++ b/webgoat-lessons/sql-injection/src/test/java/org/owasp/webgoat/sql_injection/introduction/SqlInjectionLesson9Test.java
@@ -151,7 +151,7 @@ public class SqlInjectionLesson9Test extends SqlLessonTest {
 
                     .andExpect(status().isOk())
                     .andExpect(jsonPath("lessonCompleted", is(false)))
-                    .andExpect(jsonPath("$.feedback", is(SqlInjectionLesson8Test.modifySpan(messages.getMessage("sql-injection.error")))))
+                    .andExpect(jsonPath("$.feedback", is(messages.getMessage("sql-injection.error"))))
                     .andExpect(jsonPath("$.output", containsString("feedback-negative")));
         } catch (AssertionError e) {
             if (!e.getMessage().contains(completedError)) throw e;