diff --git a/fixes/1-machines b/fixes/1-machines
index 32f747e..205d34b 100755
--- a/fixes/1-machines
+++ b/fixes/1-machines
@@ -5,7 +5,7 @@ myID=`${BINARY} --device-id`
 MASTER_LIST=/zz/zPrivate/secrets/master.list
 SHARE_LIST=/zz/zPrivate/secrets/share.list
 
-${BINARY} cli config devices ${myID} name set ${MYHOST}.${USER}
+${BINARY} cli config devices ${myID} name set ${MYHOST}.${LOGNAME}
 
 #grep -v ${myID} ${MASTER_LIST} > /tmp/final.1
 grep -v ${myID} ${SHARE_LIST} > /tmp/final.1
diff --git a/fixes/1-remove-machines b/fixes/1-remove-machines
index 8cb551a..3b25f2f 100755
--- a/fixes/1-remove-machines
+++ b/fixes/1-remove-machines
@@ -5,7 +5,7 @@ myID=`${BINARY} --device-id`
 MASTER_LIST=/zz/zPrivate/secrets/master.list
 SHARE_LIST=/zz/zPrivate/secrets/share.list
 
-${BINARY} cli config devices ${myID} name set ${MYHOST}.${USER}
+${BINARY} cli config devices ${myID} name set ${MYHOST}.${LOGNAME}
 
 #grep -v ${myID} ${MASTER_LIST} > /tmp/final.1
 grep -hv ${myID} ${SHARE_LIST} > /tmp/final.1