diff --git a/validation/templates/header b/validation/templates/header
index 35f890e..bfdbba7 100644
--- a/validation/templates/header
+++ b/validation/templates/header
@@ -7,14 +7,14 @@
 	<meta http-equiv="pragma" content="no-cache" />
 	<meta http-equiv="cache-control" content="no-cache" />
 	<meta http-equiv="expires" content="0" />
-	<link rel="stylesheet" media="screen" href="/cryptobox.css" type="text/css" />
+	<link rel="stylesheet" media="screen" href="cryptobox.css" type="text/css" />
 </head>
 <body>
 
 <div id="main">
   <div id="head">
 	<h1>Die CryptoBox</h1>
-	<h2>und zwar umsonst!</h2>
+	<h2>und zwar richtig!</h2>
   </div>
 
   <div id="content">
diff --git a/validation/templates/single_header b/validation/templates/single_header
index 7a784b7..f355a1d 100644
--- a/validation/templates/single_header
+++ b/validation/templates/single_header
@@ -1,5 +1,5 @@
 <div class="single_case">
 
-    <h1>_TESTNAME_</h1>
+    <h1><a href="_TESTSERIES_/_TESTNAME_.html" title="retrieved page">/_TESTNAME_</a></h1>
     <h2>_TESTDESCRIPTION_</h2>
 
diff --git a/validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl b/validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl
index 0882601..1c0b689 100644
--- a/validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl
+++ b/validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl
@@ -1,3 +1,3 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
-data	crypto_password=hallo
+data	crypto_password=halloRa
diff --git a/validation/test-cases/3-config/510-config-restore/delay b/validation/test-cases/3-config/510-config-restore/delay
new file mode 100644
index 0000000..209e3ef
--- /dev/null
+++ b/validation/test-cases/3-config/510-config-restore/delay
@@ -0,0 +1 @@
+20
diff --git a/validation/test-cases/3-config/510-config-restore/input.curl b/validation/test-cases/3-config/510-config-restore/input.curl
index 866edcd..73e5627 100644
--- a/validation/test-cases/3-config/510-config-restore/input.curl
+++ b/validation/test-cases/3-config/510-config-restore/input.curl
@@ -1,5 +1,5 @@
 url	https://_HOST_IP_CHANGED_/cryptobox
 data	action=config_do
 data	language=de
-data	ip=_HOST_IP_CHANGED_
-data	timeout=10
+data	ip=_HOST_IP_DEFAULT_
+data	timeout=30
diff --git a/validation/test-cases/3-config/510-config-restore/output b/validation/test-cases/3-config/510-config-restore/output
index 283d773..2211be9 100644
--- a/validation/test-cases/3-config/510-config-restore/output
+++ b/validation/test-cases/3-config/510-config-restore/output
@@ -1,6 +1,6 @@
 Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
-Data.Config.TimeOut=10
+Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
 Data.Status.IP=_HOST_IP_CHANGED_
diff --git a/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl b/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl
index 25f4132..906fdf9 100644
--- a/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl
+++ b/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl
@@ -2,6 +2,6 @@ url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
 data	crypto_password=hallo
 data	crypto_password2=hallo
-data	admin_crypto_password=root
+data	admin_password=root
 data	admin_password2=rootA
 data	confirm=ja%2C%20loesche%20alle%20Daten%21
diff --git a/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl b/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl
index b9e3215..120ff70 100644
--- a/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl
+++ b/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl
@@ -2,6 +2,6 @@ url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
 data	crypto_password=hallo
 data	crypto_password2=hallo
-data	admin_crypto_password=root
+data	admin_password=root
 data	admin_password2=root
 data	confirm=ja%2C%20loesche%20alle%20Daten%21
diff --git a/validation/test-cases/4-admin_pw/020-init_with_admin_pw/output b/validation/test-cases/4-admin_pw/020-init_with_admin_pw/output
index fd263a9..0f5b016 100644
--- a/validation/test-cases/4-admin_pw/020-init_with_admin_pw/output
+++ b/validation/test-cases/4-admin_pw/020-init_with_admin_pw/output
@@ -2,6 +2,6 @@ Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
-Data.Status.InitRunning=0
+Data.Status.InitRunning=1
 Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0
diff --git a/validation/test-cases/4-admin_pw/050-config_wrong_admin_pw/output b/validation/test-cases/4-admin_pw/050-config_wrong_admin_pw/output
index 0f5b016..fd263a9 100644
--- a/validation/test-cases/4-admin_pw/050-config_wrong_admin_pw/output
+++ b/validation/test-cases/4-admin_pw/050-config_wrong_admin_pw/output
@@ -2,6 +2,6 @@ Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
-Data.Status.InitRunning=1
+Data.Status.InitRunning=0
 Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0
diff --git a/validation/test-cases/4-admin_pw/060-config_right_admin_pw/output b/validation/test-cases/4-admin_pw/060-config_right_admin_pw/output
index 6104992..c123a8d 100644
--- a/validation/test-cases/4-admin_pw/060-config_right_admin_pw/output
+++ b/validation/test-cases/4-admin_pw/060-config_right_admin_pw/output
@@ -2,6 +2,6 @@ Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=5
 Data.Status.Config=1
-Data.Status.InitRunning=1
+Data.Status.InitRunning=0
 Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0
diff --git a/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl b/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl
index 11be9e6..5d7d5b3 100644
--- a/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl
+++ b/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl
@@ -2,7 +2,7 @@ url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
 data	crypto_password=hallo
 data	crypto_password2=hallo
-data	current_admin_crypto_password=rootA
-data	admin_crypto_password=root
+data	current_admin_password=rootA
+data	admin_password=root
 data	admin_password2=root
 data	confirm=ja%2C%20loesche%20alle%20Daten%21
diff --git a/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/output b/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/output
index 0f5b016..c123a8d 100644
--- a/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/output
+++ b/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/output
@@ -1,7 +1,7 @@
 Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
-Data.Config.TimeOut=30
+Data.Config.TimeOut=5
 Data.Status.Config=1
-Data.Status.InitRunning=1
+Data.Status.InitRunning=0
 Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0
diff --git a/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/delay b/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/delay
new file mode 100644
index 0000000..d61f00d
--- /dev/null
+++ b/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/delay
@@ -0,0 +1 @@
+90
diff --git a/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl b/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl
index 641b5ea..7416a26 100644
--- a/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl
+++ b/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl
@@ -2,5 +2,5 @@ url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
 data	crypto_password=hallo
 data	crypto_password2=hallo
-data	current_admin_crypto_password=root
+data	current_admin_password=root
 data	confirm=ja%2C%20loesche%20alle%20Daten%21
