diff --git a/src/main/java/org/eclipse/openk/portal/controller/InputDataValuator.java b/src/main/java/org/eclipse/openk/portal/controller/InputDataValuator.java
index b288a75..fc094a5 100644
--- a/src/main/java/org/eclipse/openk/portal/controller/InputDataValuator.java
+++ b/src/main/java/org/eclipse/openk/portal/controller/InputDataValuator.java
@@ -40,8 +40,6 @@
         LoginCredentials obj;
         try {
             obj = JsonGeneratorBase.getGson().fromJson(credentials, LoginCredentials.class);
-            checkWhitelistChars(obj.getPassword());
-            checkWhitelistChars(obj.getPassword());
         } catch (Exception e) { // NOSONAR
             obj = null;
         }
@@ -51,7 +49,7 @@
         }
     }
 
-    private void checkWhitelistChars(String txt) throws PortalBadRequest {
+    private void checkWhitelistChars(String txt) throws PortalBadRequest { // NOSONAR 24.09.2018: There's a great possibility that we need a whitebox-charecter check for security reasons again. Because of this, we leave this code
         checkWhitelistChars(txt, false);
     }
 
