diff --git a/custom/panel_templates/Default/core/users_edit.tpl b/custom/panel_templates/Default/core/users_edit.tpl
index 04a014afd5..822da5c8b4 100644
--- a/custom/panel_templates/Default/core/users_edit.tpl
+++ b/custom/panel_templates/Default/core/users_edit.tpl
@@ -56,7 +56,7 @@
                                                 {if isset($UPDATE_UUID)}<a class="dropdown-item"
                                                                            href="{$UPDATE_UUID_LINK}">{$UPDATE_UUID}</a>{/if}
                                                 {if isset($VALIDATE_USER)}<a class="dropdown-item"
-                                                                             href="{$VALIDATE_USER_LINK}">{$VALIDATE_USER}</a>{/if}
+                                                                             href="#" onclick="validateUser()">{$VALIDATE_USER}</a>{/if}
                                             </div>
                                         </div>
                                         <a href="{$BACK_LINK}" class="btn btn-warning">{$BACK}</a>
@@ -215,6 +215,10 @@
     <!-- End Wrapper -->
 </div>
 
+<form style="display:none" action="{$VALIDATE_USER_LINK}" method="post" id="validateUserForm">
+    <input type="hidden" name="token" value="{$TOKEN}" />
+</form>
+
 {include file='scripts.tpl'}
 
 <script type="text/javascript">
@@ -223,6 +227,12 @@
       $('#deleteModal').modal().show();
     }
     {/if}
+
+    {if isset($VALIDATE_USER)}
+    function validateUser() {
+      $('#validateUserForm').submit();
+    }
+    {/if}
 </script>
 
 </body>
diff --git a/modules/Core/pages/panel/users_edit.php b/modules/Core/pages/panel/users_edit.php
index 4eda2ee900..839dc7b0c0 100644
--- a/modules/Core/pages/panel/users_edit.php
+++ b/modules/Core/pages/panel/users_edit.php
@@ -39,23 +39,26 @@
 
 if (isset($_GET['action'])) {
     if ($_GET['action'] == 'validate') {
-        // Validate the user
-        if ($user_query->active == 0) {
-            $queries->update('users', $user_query->id, array(
-                'active' => 1,
-                'reset_code' => ''
-            ));
-
-            HookHandler::executeEvent('validateUser', array(
-                'event' => 'validateUser',
-                'user_id' => $user_query->id,
-                'username' => Output::getClean($user_query->username),
-                'uuid' => Output::getClean($user_query->uuid),
-                'language' => $language
-            ));
-
-            Session::flash('edit_user_success', $language->get('admin', 'user_validated_successfully'));
+        if (Token::check()) {
+            // Validate the user
+            if ($user_query->active == 0) {
+                $queries->update('users', $user_query->id, array(
+                    'active' => 1,
+                    'reset_code' => ''
+                ));
+
+                HookHandler::executeEvent('validateUser', array(
+                    'event' => 'validateUser',
+                    'user_id' => $user_query->id,
+                    'username' => Output::getClean($user_query->username),
+                    'uuid' => Output::getClean($user_query->uuid),
+                    'language' => $language
+                ));
+
+                Session::flash('edit_user_success', $language->get('admin', 'user_validated_successfully'));
+            }
         }
+
     } else if ($_GET['action'] == 'update_mcname') {
         require_once(ROOT_PATH . '/core/integration/uuid.php');
         $uuid = $user_query->uuid;