diff --git a/usb_drive/setup_usb.sh b/usb_drive/setup_usb.sh
index dfd8465b10646ac2d9862e58b59359057f7b8069..8dd0b64717eb7657c751ddb859bd626a040209a4 100755
--- a/usb_drive/setup_usb.sh
+++ b/usb_drive/setup_usb.sh
@@ -54,22 +54,32 @@ function prepare_usb {
 function create_dir {
   # crete the dir /Openslx/home
   if [ ! -d "$mount_path$DIR_OPENSLX" ];  then
+        echo "oi"
        mkdir "$mount_path"/Openslx/
        mkdir "$mount_path"/Openslx/.config/
-       mkdir "$mount_path"/Openslx/home
-       mkdir "$mount_path"/Openslx/home/Destkop
-       mkdir "$mount_path"/Openslx/home/Documents
-       mkdir "$mount_path"/Openslx/home/Downloads
-       mkdir "$mount_path"/Openslx/home/Music
-       mkdir "$mount_path"/Openslx/home/Pictures
-       mkdir "$mount_path"/Openslx/home/Public
-       mkdir "$mount_path"/Openslx/home/Templates
-       mkdir "$mount_path"/Openslx/home/Videos
        touch "$mount_path"/Openslx/.config/config
        touch "$mount_path"/Openslx/log
   fi
 }
 
+function create_user_dir {
+  # crete the dir /Openslx/home
+  if [ ! -d "$mount_path$new_user$DIR_OPENSLX" ];  then
+       mkdir "$mount_path"/Openslx/$new_user
+       mkdir "$mount_path"/Openslx/$new_user/Destkop
+       mkdir "$mount_path"/Openslx/$new_user/Documents
+       mkdir "$mount_path"/Openslx/$new_user/Downloads
+       mkdir "$mount_path"/Openslx/$new_user/Music
+       mkdir "$mount_path"/Openslx/$new_user/Pictures
+       mkdir "$mount_path"/Openslx/$new_user/Public
+       mkdir "$mount_path"/Openslx/$new_user/Templates
+       mkdir "$mount_path"/Openslx/$new_user/Videos
+  fi
+}
+
+
+
+
 function read_user_pass {
 
   #get the username and the password
@@ -140,12 +150,6 @@ function get_user {
       fi
   done
 
-  #create dir of the user
-  if [ ! -d "$mount_path"/Openslx/$new_user ];  then
-       mkdir "$mount_path"/Openslx/$new_user
-  fi
-
-
 }
 
 function success_message {
@@ -247,6 +251,7 @@ function usb_drive {
   mount_path="$name_selected"
   create_dir
   get_user
+  create_user_dir
   create_config
   fim_setup
 }