diff --git a/ChangeLog b/ChangeLog
index d82029e..8e6e5fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
     added remove command to unmount and remove device safely
     added default_options_ntfs to udevil.conf
     [devmon 1.1.2] udevil clean on remove device #6
+    sshfs uses current user is none specified
 0.3.0   2012-07-13:
     cifs,ftpfs dont quote username, double quote password #3
     default udevil.conf: allow option flush
diff --git a/src/udevil.c b/src/udevil.c
index f84021c..9bd8573 100644
--- a/src/udevil.c
+++ b/src/udevil.c
@@ -2416,10 +2416,10 @@ static int parse_network_url( const char* url, const char* fstype,
             nm->url = g_strdup( "none" );
         else if ( !g_strcmp0( nm->fstype, "sshfs" ) )
             nm->url = g_strdup_printf( "sshfs#%s%s%s%s%s:%s",
-                            nm->user ? nm->user : "",
+                            nm->user ? nm->user : g_get_user_name(),
                             nm->pass ? ":" : "",
                             nm->pass ? nm->pass : "",
-                            nm->user || nm->pass ? "@" : "",
+                            "@",   //nm->user || nm->pass ? "@" : "",
                             nm->host,
                             nm->path ? nm->path : "/" );
         else