diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c
index 4114089af..30b11b2bf 100644
--- a/src/bin/e_fm/e_fm_main_eeze.c
+++ b/src/bin/e_fm/e_fm_main_eeze.c
@@ -545,15 +545,15 @@ _e_fm_main_eeze_volume_mount(E_Volume *v)
 
    if (v->fstype)
      {
-        if ((!strcmp(v->fstype, "vfat")) ||
+        if ((!strstr(v->fstype, "fat")) ||
             (!strcmp(v->fstype, "ntfs")) ||
             (!strcmp(v->fstype, "iso9660")) ||
             (!strcmp(v->fstype, "jfs")))
           {
-             opts |= EEZE_DISK_MOUNTOPT_UTF8;
+             opts |= EEZE_DISK_MOUNTOPT_UTF8 | EEZE_DISK_MOUNTOPT_UID;
           }
      }
-   opts |= EEZE_DISK_MOUNTOPT_UID | EEZE_DISK_MOUNTOPT_NOSUID | EEZE_DISK_MOUNTOPT_NODEV | EEZE_DISK_MOUNTOPT_NOEXEC;
+   opts |= EEZE_DISK_MOUNTOPT_NOSUID | EEZE_DISK_MOUNTOPT_NODEV | EEZE_DISK_MOUNTOPT_NOEXEC;
 
    _e_fm_main_eeze_mount_point_set(v);
    if (!v->mount_point) goto error;