diff --git a/webui/controller/user/settings.php b/webui/controller/user/settings.php
index e0fe061c..ab3b7608 100644
--- a/webui/controller/user/settings.php
+++ b/webui/controller/user/settings.php
@@ -41,8 +41,8 @@ class ControllerUserSettings extends Controller {
 
       $auditgroups = preg_replace("/\n/", ", ", $this->model_group_group->get_groups_by_email($session->get("emails")));
 
-      $folders = $session->get("folders");
-  
+      $folders = array_keys($session->get("folders"));
+
       foreach ($folders as $r) {
          $auditfolders .= ', ' . $r;
       }
diff --git a/webui/model/user/auth.php b/webui/model/user/auth.php
index 31717134..a5a47ee9 100644
--- a/webui/model/user/auth.php
+++ b/webui/model/user/auth.php
@@ -15,6 +15,9 @@ class ModelUserAuth extends Model {
       $session->set("auditdomains", $data['auditdomains']);
       $session->set("emails", $data['emails']);
 
+      //$data['folders'] = $this->model_folder_folder->get_folder_id_array_for_user($query->row['uid'], $data['admin_user']);
+      $data['folders'] = $this->model_folder_folder->get_folder_names_for_user($data['email']);
+
       $session->set("folders", $data['folders']);
    }
 
@@ -124,9 +127,6 @@ class ModelUserAuth extends Model {
          $extra_emails = $this->model_user_user->get_email_addresses_from_groups($data['emails']);
          $data['emails'] = array_merge($data['emails'], $extra_emails);
 
-         //$data['folders'] = $this->model_folder_folder->get_folder_id_array_for_user($query->row['uid'], $data['admin_user']);
-         $data['folders'] = $this->model_folder_folder->get_folder_names_for_user($data['email']);
-
          $session->set("auth_data", $data);
 
          $this->is_ga_code_needed($username);
diff --git a/webui/view/theme/default/templates/user/settings.tpl b/webui/view/theme/default/templates/user/settings.tpl
index 73c21070..f7053a6f 100644
--- a/webui/view/theme/default/templates/user/settings.tpl
+++ b/webui/view/theme/default/templates/user/settings.tpl
@@ -34,7 +34,7 @@
 
 <?php } ?>
 	 
-<?php if(ENABLE_FOLDER_RESTRICTIONS == 1) { ?>
+<?php if($folders) { ?>
 	 
 	 <tr>
 		<td><?php print $text_folders; ?>:</td>