diff --git a/_cranspasswords b/_cranspasswords
index be2ab25..b63948c 100644
--- a/_cranspasswords
+++ b/_cranspasswords
@@ -20,7 +20,11 @@ _cranspasswords(){
             ;;
         esac
     else
-        _cranspasswords_files
+        if [[ $words[2] == '-' ]]; then
+            _cranspasswords_args
+        else
+           _cranspasswords_files
+        fi;
     fi
 }
 
@@ -41,12 +45,12 @@ _cranspasswords_files(){
         liste_fichiers=($(cranspasswords --server $server --list 2>/dev/null | tail -n +2 | head -n -1 | awk '{print $2}' | tr '\n' ' '))
         echo $liste_fichiers > /tmp/$fname
         for i in $liste_fichiers; do
-            _wanted files expl "file names" compadd $i;
+            _wanted files expl "file names on ${server}" compadd $i;
         done;
     else
         liste_fichiers=($(cat /tmp/$fname))
         for i in $liste_fichiers; do
-            _wanted files expl "file names" compadd $i;
+            _wanted files expl "file names on ${server}" compadd $i;
         done;
     fi;
 }
@@ -68,12 +72,12 @@ _cranspasswords_roles(){
         liste_fichiers=($(cranspasswords --server $server --list-roles 2>/dev/null | tail -n +2 | awk '{print $2}' | tr '\n' ' '))
         echo $liste_fichiers > /tmp/$fname
         for i in $liste_fichiers; do
-            _wanted roles expl "role names" compadd $i;
+            _wanted roles expl "role names on ${server}" compadd $i;
         done;
     else
         liste_fichiers=($(cat /tmp/$fname))
         for i in $liste_fichiers; do
-            _wanted roles expl "role names" compadd $i;
+            _wanted roles expl "role names on ${server}" compadd $i;
         done;
     fi;
 }