diff --git a/ggatec/ggatec.c b/ggatec/ggatec.c
index e421614..660bd8a 100644
--- a/ggatec/ggatec.c
+++ b/ggatec/ggatec.c
@@ -59,7 +59,7 @@ enum { UNSET, CREATE, DESTROY, LIST, RESCUE } action = UNSET;
 
 static const char *path = NULL;
 static const char *host = NULL;
-static int unit = -1;
+static int unit = G_GATE_UNIT_AUTO;
 static unsigned flags = 0;
 static int force = 0;
 static unsigned queue_size = G_GATE_QUEUE_SIZE;
diff --git a/ggatel/ggatel.c b/ggatel/ggatel.c
index 03979c3..6a3f26e 100644
--- a/ggatel/ggatel.c
+++ b/ggatel/ggatel.c
@@ -50,7 +50,7 @@
 enum { UNSET, CREATE, DESTROY, LIST, RESCUE } action = UNSET;
 
 static const char *path = NULL;
-static int unit = -1;
+static int unit = G_GATE_UNIT_AUTO;
 static unsigned flags = 0;
 static int force = 0;
 static unsigned queue_size = G_GATE_QUEUE_SIZE;