diff --git galerie/galerie.module galerie/galerie.module
index ebefa80..f67a3a3 100644
--- galerie/galerie.module
+++ galerie/galerie.module
@@ -274,9 +274,10 @@ function galerie_update($node) {
 function galerie_menu() {
   return array(
     'galerie/ajax/type_form' => array(
-      'type' => MENU_CALLBACK,
-      'delivery callback' => 'ajax_deliver',
+      'delivery callback' => 'ajax_deliver',    
       'page callback' => 'galerie_type_form',
+      'access callback' => TRUE,
+      'type' => MENU_CALLBACK,        
       'access arguments' => array('access content'),
     ),
     'galerie/ajax/image_info/%galerie_menu/%' => array(
@@ -300,7 +301,9 @@ function galerie_menu() {
  * Returns form elements for use in galerie settings forms.
  */
 function galerie_type_form() {
+
   list($form, $form_state, $form_id, $form_build_id) = ajax_get_form();
+
   $cached_form = form_get_cache($form_build_id, $form_state);
 
   $type = $_POST['galerie_type'];
diff --git galerie_directory/galerie_directory.module galerie_directory/galerie_directory.module
index 6fded37..0b99719 100644
--- galerie_directory/galerie_directory.module
+++ galerie_directory/galerie_directory.module
@@ -44,7 +44,7 @@ function galerie_directory_galerie_form($node, $form_state) {
         '#type' => 'textfield',
         '#title' => t('Path'),
         '#description' => t('Path to the directory that will be displayed in this gallery.'),
-        '#default_value' => isset($node->galerie_directory) ? $node->galerie_directory : file_directory_path(),
+        '#default_value' => isset($node->galerie_directory) ? $node->galerie_directory : variable_get('file_' . file_default_scheme() . '_path', conf_path() . '/files'),
         '#required' => TRUE,
       ),
       'galerie_recursive' => array(
@@ -88,11 +88,11 @@ function galerie_directory_load($nodes) {
 function galerie_directory_node_insert($node) {
   if ($node->type == 'galerie' and $node->galerie_type == 'directory') {
     if ($node->galerie_create_directory) {
-      $node->galerie_directory = file_directory_path() . '/galerie-' . $node->nid;
+      $node->galerie_directory = variable_get('file_' . file_default_scheme() . '_path', conf_path() . '/files') . '/galerie-' . $node->nid;
 
       for ($try = 1 ; file_exists($node->galerie_directory) ; $try++) {
         // just in case it already exists
-        $node->galerie_directory = file_directory_path() . '/galerie-' . $node->nid . '-' . $try;
+        $node->galerie_directory = variable_get('file_' . file_default_scheme() . '_path', conf_path() . '/files') . '/galerie-' . $node->nid . '-' . $try;
       }
 
       if (drupal_mkdir($node->galerie_directory)) {
@@ -243,7 +243,7 @@ function _galerie_directory_image_info($node, $file) {
  * Returns the thumbnails directory.
  */
 function _galerie_directory_thumbnails_directory_base() {
-  $directory = file_directory_path().'/galerie-directory';
+  $directory = variable_get('file_' . file_default_scheme() . '_path', conf_path() . '/files') .'/galerie-directory';
   if (!file_exists($directory)) {
     drupal_mkdir($directory, 0777, TRUE);
   }