diff --git a/phpBB/index.php b/phpBB/index.php
index f47a78c19c..8f4f7530b7 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -30,8 +30,8 @@ $mark_read = (isset($_REQUEST['mark'])) ? $_REQUEST['mark'] : '';
 
 // Start session management
 $user->start();
-$user->setup();
 $auth->acl($user->data);
+$user->setup();
 
 // Handle marking posts
 if ($mark_read == 'forums')
@@ -98,8 +98,8 @@ else
 
 
 // Grab group details for legend display
-$sql = "SELECT group_name, group_colour, group_type  
-	FROM " . GROUPS_TABLE . " 
+$sql = 'SELECT group_name, group_colour, group_type  
+	FROM ' . GROUPS_TABLE . " 
 	WHERE group_colour <> '' 
 		AND group_display = 1";
 $result = $db->sql_query($sql);
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 8612d9a55a..cbbc1e8a26 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -290,9 +290,10 @@ class ucp extends user
 
 // Start session management
 $user->start();
-$user->setup();
 $auth->acl($user->data);
 
+$user->setup();
+
 // Basic parameter data
 $mode = (!empty($_REQUEST['mode'])) ? htmlspecialchars($_REQUEST['mode']) : '';
 $module = (!empty($_REQUEST['i'])) ? intval($_REQUEST['i']) : 1;