diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb
index 77169af..e1b01b8 100644
--- a/App_Code/VERAG_VARIABLES.vb
+++ b/App_Code/VERAG_VARIABLES.vb
@@ -56,15 +56,17 @@ Public Class VERAG_VARIABLES
             Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
             Argon.Salt = salt
             Argon.DegreeOfParallelism = 8
-            Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3)
-            Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190)
+            Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(1, 2)
+            'Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190)
+            Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length
             Return Argon.GetBytes(nHash)
         Else
             Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
             Argon.Salt = salt
             Argon.DegreeOfParallelism = 10
             Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3)
-            Argon.MemorySize = (((nIterations * 20.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190)
+            'Argon.MemorySize = (((nIterations * 20.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190)
+            Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length
             Return Argon.GetBytes(nHash)
         End If
     End Function
@@ -75,15 +77,17 @@ Public Class VERAG_VARIABLES
             Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
             Argon.Salt = salt
             Argon.DegreeOfParallelism = 8
-            Argon.Iterations = nIterations
-            Argon.MemorySize = (((nIterations * 17.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190)
+            Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3)
+            'Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190)
+            Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length
             Return Await Argon.GetBytesAsync(nHash)
         Else
             Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
             Argon.Salt = salt
             Argon.DegreeOfParallelism = 10
-            Argon.Iterations = nIterations
-            Argon.MemorySize = (((nIterations * 18.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190)
+            Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3)
+            'Argon.MemorySize = (((nIterations * 21.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190)
+            Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length
             Return Await Argon.GetBytesAsync(nHash)
         End If
     End Function
@@ -102,6 +106,4 @@ Public Class VERAG_VARIABLES
         rand.GetBytes(one_byte)
         Return min + (max - min) * (one_byte(0) / 255)
     End Function
-
-
 End Class
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index e7d6c1c..053979e 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -22,7 +22,7 @@ Partial Class login_FLEX
             Try
                 Dim teststr = String.Empty
                 If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
-                    intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 8), Math.Pow(2, 17))
+                    intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 7))
                     teststr = Await TestPerformance.TestHashrateServerAsync(0.052 * VERAG_VARIABLES.GetCpuSpeed())
                 Else
                     intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 8), Math.Pow(2, 17))
@@ -30,6 +30,10 @@ Partial Class login_FLEX
                 End If
                 If String.Equals(teststr, String.Empty) = False Then
                     intzahliterats = VERAG_VARIABLES.getiterationnumber
+                    teststr = Await TestPerformance.TestHashrateServerAsync(0.042 * VERAG_VARIABLES.GetCpuSpeed())
+                    If String.Equals(teststr, String.Empty) = False Then
+                        Response.Write("Der Webserver kann momentan keine sicherheitsrelevanten Aufgaben ausführen. Bitte versuchen Sie es später noch einmal.")
+                    End If
                 End If
             Catch Ex As SettingsPropertyNotFoundException
                 VERAG_VARIABLES.seterrorcount(4534)