diff --git a/exec/finger.js b/exec/finger.js
index fa6b4b3a078b0e8c4694918b2779242ab56ca938..79316daadecd25100b62fa71dcde618ab91b0c36 100644
--- a/exec/finger.js
+++ b/exec/finger.js
@@ -6,10 +6,12 @@ if(argc>0 && argv[0].indexOf('@')!=-1)
 	dest = argv[0];
 else if((dest = prompt("User (user@hostname)"))==null)
 	exit();
+
 if((hp = dest.indexOf('@'))==-1) {
-	alert("Invalid user");
-	exit();
+        dest += "@" + system.host_name;
+	hp = dest.indexOf('@')
 }
+
 host = dest.slice(hp+1);
 sock = new Socket();
 //sock.debug = true;