diff --git a/post.php b/post.php
index d2a86bc0..f8f7bb33 100644
--- a/post.php
+++ b/post.php
@@ -1039,6 +1039,7 @@ if(isset($_POST['encryption_update'])){
     if(!password_verify($password, $row['user_password'])){
         $_SESSION['alert_message'] = "User password incorrect.";
         header("Location: " . $_SERVER["HTTP_REFERER"]);
+        exit();
     }
 
     //First, check if this user is setup for the new encryption setup
diff --git a/settings-update.php b/settings-update.php
index a386cef2..05f740cb 100644
--- a/settings-update.php
+++ b/settings-update.php
@@ -102,6 +102,7 @@ if ($config_aes_key) {
                 <input type="password" class="form-control" placeholder="Account Password" name="password" value="" required="">
             </div>
             <br>
+            <p>Warning: This action is irreversible. Do NOT proceed without a backup.</p>
             <button type="submit" class="btn btn-danger" name="encryption_update">Update encryption scheme for this company</button>
         </div>
     </form>
@@ -109,7 +110,7 @@ if ($config_aes_key) {
 }
 else {
     echo "Config AES key is not set for this company.<br>";
-    echo "Please ensure upgrade is required. If you are sure you need to update, ensure the AES key is for this company.";
+    echo "Please ensure upgrade is required. If you are sure you need to update, ensure the AES key is set correctly for this company.";
 }
 
 ?>