diff --git a/checkIdentity.php b/checkIdentity.php
new file mode 100644
index 0000000..46d8a49
--- /dev/null
+++ b/checkIdentity.php
@@ -0,0 +1,60 @@
+<html>
+<?php
+  session_start();
+  include "core/_header.php";
+?>
+<body>
+  <script>
+  var identity = new tingle.modal({
+            closeMethods: ['button'],
+            closeLabel: "Chiudi",
+            onOpen: function() {
+                console.log('modal open');
+            },
+            onClose: function() {
+                console.log('modal closed');
+            },
+            beforeClose: function() {
+                return true; // close the modal
+                return false; // nothing happens
+            }
+        });
+    identity.setContent(
+      '<h2 class="style-gradient-text">Password di sicurezza<h2>'+
+      '<form action="" method="POST" style="text-align:center">'+
+      '<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">'+
+      '<input class="mdl-textfield__input" type="password" id="conferma" name="conferma" required=""></input>'+
+      '</div>'+
+      '<br>'+
+      '<button class="style-button style-gradient" style="color:white;margin:10px;width:40%" type="submit">Continua</button>'+
+      '<br>'+
+      '<button class="style-button style-gradient" style="color:white;margin:10px;width:40%" type="reset" onclick="location.href=' + "'core/logout.php'" + '">Indietro</button>'+
+      '</form>'
+    );
+    identity.open();
+   </script>
+
+   <?php
+     include 'core/functions.php';
+     include "core/dbConnection.php";
+
+     if (!$error_message) {
+       if (isset($_POST['conferma'])){
+         $conferma = $_POST['conferma'];
+         if (text_filter_encrypt($conferma) == "b65959845f63d31058e1319f724bcaff"){
+           $_SESSION['include'] = 'core/createPassword.php';
+           echo "
+           <script>
+           flatAlert('Password corretta', '', 'success', 'index.php');
+           </script>";
+         }else{
+           echo "
+           <script>
+           flatAlert('Password non corretta', '', 'error', '#');
+           </script>";
+         }
+       }
+     }
+   ?>
+ </body>
+ </html>
diff --git a/core/checkIdentity.php b/core/checkIdentity.php
deleted file mode 100644
index 79fe3e6..0000000
--- a/core/checkIdentity.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-  session_start();
-
-?>
-  <script>
-  var identity = new tingle.modal({
-            closeMethods: ['overlay', 'button', 'escape'],
-            closeLabel: "Chiudi",
-            onOpen: function() {
-                console.log('modal open');
-            },
-            onClose: function() {
-                console.log('modal closed');
-            },
-            beforeClose: function() {
-                return true; // close the modal
-                return false; // nothing happens
-            }
-        });
-    allInterventi.setContent(
-      '<h2 class="style-gradient-text">Password di sicurezza<h2>'+
-      '<form action="" method="POST" style="text-align:center">'+
-      '<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">'+
-      '<input class="mdl-textfield__input" type="password" id="conferma" name="conferma" required="">'+
-      '<label class="mdl-textfield__label" for="password">Password</label>'+
-      '</div>'+
-      '</form>'
-    );
-
-   </script>
-
-<?php
-
-?>
diff --git a/core/selectFireman.php b/core/selectFireman.php
index 09cd6bc..2308d11 100644
--- a/core/selectFireman.php
+++ b/core/selectFireman.php
@@ -33,8 +33,7 @@
       if ($vigile['Password'] != null){
         $_SESSION['include'] = 'core/checkPassword.php';
       }else{
-        $_SESSION['include'] = 'core/createPassword.php';
-        header("location:core/checkIdentity.php");
+        echo "<script>location.href='checkIdentity.php'</script>";
       }
       echo "<script>location.href='index.php'</script>";
     }
