diff --git a/core/users/group_permissions.php b/core/users/group_permissions.php
index be5fc38ea2..1c014f13f5 100644
--- a/core/users/group_permissions.php
+++ b/core/users/group_permissions.php
@@ -23,11 +23,13 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-require_once "root.php";
-require_once "resources/require.php";
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
 
 //check permisions
-	require_once "resources/check_auth.php";
 	if (permission_exists('group_permissions') || if_group("superadmin")) {
 		//access granted
 	}
diff --git a/core/users/groupadd.php b/core/users/groupadd.php
index e58e207376..237e99407f 100644
--- a/core/users/groupadd.php
+++ b/core/users/groupadd.php
@@ -23,11 +23,13 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "root.php";
-require_once "resources/require.php";
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
 
 //check permissions
-	require_once "resources/check_auth.php";
 	if (permission_exists('group_add')) {
 		//access allowed
 	}
diff --git a/core/users/groupdelete.php b/core/users/groupdelete.php
index 861642acb3..b2c45ccd4f 100644
--- a/core/users/groupdelete.php
+++ b/core/users/groupdelete.php
@@ -23,11 +23,13 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "root.php";
-require_once "resources/require.php";
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
 
 //check permissions
-	require_once "resources/check_auth.php";
 	if (permission_exists('group_delete') || if_group("superadmin")) {
 		//access allowed
 	}
diff --git a/core/users/groupedit.php b/core/users/groupedit.php
index 71e4d30cbb..495d1c770c 100644
--- a/core/users/groupedit.php
+++ b/core/users/groupedit.php
@@ -23,11 +23,13 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "root.php";
-require_once "resources/require.php";
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
 
 //check permissions
-	require_once "resources/check_auth.php";
 	if (permission_exists('group_edit')) {
 		//access allowed
 	}
diff --git a/core/users/groupmemberadd.php b/core/users/groupmemberadd.php
index 7aad40d310..dedc837ec9 100644
--- a/core/users/groupmemberadd.php
+++ b/core/users/groupmemberadd.php
@@ -23,16 +23,20 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('group_member_add') || if_group("superadmin")) {
-	//access allowed
-}
-else {
-	echo "access denied";
-	return;
-}
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('group_member_add') || if_group("superadmin")) {
+		//access allowed
+	}
+	else {
+		echo "access denied";
+		return;
+	}
 
 //requires a superadmin to add a user to the superadmin group
 	if (!if_group("superadmin") && $_GET["group_name"] == "superadmin") {
diff --git a/core/users/groupmemberdelete.php b/core/users/groupmemberdelete.php
index 2fb138db2a..5c23dc636a 100644
--- a/core/users/groupmemberdelete.php
+++ b/core/users/groupmemberdelete.php
@@ -23,16 +23,20 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('group_member_delete') || if_group("superadmin")) {
-	//access allowed
-}
-else {
-	echo "access denied";
-	return;
-}
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('group_member_delete') || if_group("superadmin")) {
+		//access allowed
+	}
+	else {
+		echo "access denied";
+		return;
+	}
 
 //requires a superadmin to delete superadmin group
 	if (!if_group("superadmin") && $_GET["group_name"] == "superadmin") {
diff --git a/core/users/groupmembers.php b/core/users/groupmembers.php
index 1ddbaf6a89..5b80264b9d 100644
--- a/core/users/groupmembers.php
+++ b/core/users/groupmembers.php
@@ -23,16 +23,20 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('group_members_view') || if_group("superadmin")) {
-	//access allowed
-}
-else {
-	echo "access denied";
-	return;
-}
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('group_members_view') || if_group("superadmin")) {
+		//access allowed
+	}
+	else {
+		echo "access denied";
+		return;
+	}
 
 //requires a superadmin to view members of the superadmin group
 	if (!if_group("superadmin") && $_GET["group_name"] == "superadmin") {
diff --git a/core/users/groups.php b/core/users/groups.php
index f6c932845d..e6c745a007 100644
--- a/core/users/groups.php
+++ b/core/users/groups.php
@@ -23,11 +23,13 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "root.php";
-require_once "resources/require.php";
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
 
 //check the permissions
-	require_once "resources/check_auth.php";
 	if (if_group("admin") || if_group("superadmin")) {
 		//access allowed
 	}
diff --git a/core/users/index.php b/core/users/index.php
index 5b106ff02c..5fc40862dc 100644
--- a/core/users/index.php
+++ b/core/users/index.php
@@ -23,16 +23,20 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('user_view') || if_group("superadmin")) {
-	//access allowed
-}
-else {
-	echo "access denied";
-	return;
-}
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('user_view') || if_group("superadmin")) {
+		//access allowed
+	}
+	else {
+		echo "access denied";
+		return;
+	}
 
 //add multi-lingual support
 	$language = new text;
diff --git a/core/users/permissions_copy.php b/core/users/permissions_copy.php
index c9402ad29b..0d66859558 100644
--- a/core/users/permissions_copy.php
+++ b/core/users/permissions_copy.php
@@ -23,11 +23,13 @@
 	Contributor(s):
 	Sérgio Reis <uc@wavecom.pt>
 */
-include "root.php";
-require_once "resources/require.php";
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
 
 //check permissions
-	require_once "resources/check_auth.php";
 	if (permission_exists('extension_add')) {
 		//access granted
 	}
diff --git a/core/users/signup.php b/core/users/signup.php
index 5cc28e4bcc..b138809861 100644
--- a/core/users/signup.php
+++ b/core/users/signup.php
@@ -23,11 +23,13 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "root.php";
-require_once "resources/require.php";
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
 
 //check permissions
-	require_once "resources/check_auth.php";
 	if (if_group("admin") || if_group("superadmin")) {
 		//access allowed
 	}
diff --git a/core/users/user_setting_delete.php b/core/users/user_setting_delete.php
index 52a021d600..e4b9b33955 100644
--- a/core/users/user_setting_delete.php
+++ b/core/users/user_setting_delete.php
@@ -23,16 +23,20 @@
  Contributor(s):
  Mark J Crane <markjcrane@fusionpbx.com>
 */
-require_once "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('user_setting_delete')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('user_setting_delete')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
 
 //add multi-lingual support
 	$language = new text;
diff --git a/core/users/user_setting_edit.php b/core/users/user_setting_edit.php
index ba2b6b36fd..9eefe5e9e9 100644
--- a/core/users/user_setting_edit.php
+++ b/core/users/user_setting_edit.php
@@ -23,16 +23,20 @@
  Contributor(s):
  Mark J Crane <markjcrane@fusionpbx.com>
 */
-require_once "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('user_setting_add') || permission_exists('user_setting_edit')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('user_setting_add') || permission_exists('user_setting_edit')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
 
 //add multi-lingual support
 	$language = new text;
diff --git a/core/users/user_settings.php b/core/users/user_settings.php
index 752744db82..acd3aaaf10 100644
--- a/core/users/user_settings.php
+++ b/core/users/user_settings.php
@@ -23,16 +23,20 @@
  Contributor(s):
  Mark J Crane <markjcrane@fusionpbx.com>
 */
-require_once "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('user_setting_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('user_setting_view')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
 
 //toggle setting enabled
 	if (sizeof($_REQUEST) > 1) {
diff --git a/core/users/userdelete.php b/core/users/userdelete.php
index b455e25ef2..db2cbc25e4 100644
--- a/core/users/userdelete.php
+++ b/core/users/userdelete.php
@@ -23,16 +23,20 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('user_delete')) {
-	//access allowed
-}
-else {
-	echo "access denied";
-	return;
-}
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('user_delete')) {
+		//access allowed
+	}
+	else {
+		echo "access denied";
+		return;
+	}
 
 //add multi-lingual support
 	$language = new text;
diff --git a/core/users/users.php b/core/users/users.php
index b9a191c982..c7305fbb6e 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -23,16 +23,20 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-require_once "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists("user_view") || if_group("superadmin")) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists("user_view") || if_group("superadmin")) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
 
 //additional includes
 	require_once "resources/paging.php";
diff --git a/core/users/usersupdate.php b/core/users/usersupdate.php
index 91414aa228..cc287f11ec 100644
--- a/core/users/usersupdate.php
+++ b/core/users/usersupdate.php
@@ -24,19 +24,23 @@
 	Mark J Crane <markjcrane@fusionpbx.com>
 	Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
 */
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists("user_add") ||
-	permission_exists("user_edit") ||
-	permission_exists("user_delete") ||
-	if_group("superadmin")) {
-	//access allowed
-}
-else {
-	echo "access denied";
-	return;
-}
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permisions
+	if (permission_exists("user_add") ||
+		permission_exists("user_edit") ||
+		permission_exists("user_delete") ||
+		if_group("superadmin")) {
+		//access allowed
+	}
+	else {
+		echo "access denied";
+		return;
+	}
 
 //add multi-lingual support
 	$language = new text;