diff --git a/README.md b/README.md
index ef6d2cc..667b7c4 100644
--- a/README.md
+++ b/README.md
@@ -199,6 +199,12 @@ hostname:token string. Place this string into $HOME/.xs_id to allow logins witho
 entering a password (obviously, $HOME/.xs_id on both server and client for the user
 should *not* be world-readable.)
 
+```
+$ xs -g user@host.net >~/.xs_id
+```
+[enter password blindly, authtoken entry will be stored in ~/.xs_id]
+
+
 ### File Copying using xc
 
 xc is a symlink to xs, and the binary checks its own filename to determine whether
diff --git a/xs/xs.go b/xs/xs.go
index 3f8823f..b30ea05 100755
--- a/xs/xs.go
+++ b/xs/xs.go
@@ -1007,10 +1007,14 @@ func main() { //nolint: funlen, gocyclo
 	})
 
 	if authCookie == "" {
-		// No auth token, prompt for password
-		fmt.Printf("Gimme cookie:")
+		if !gopt {
+			// No auth token, prompt for password
+			fmt.Printf("Gimme cookie:")
+		}
 		ab, e := xs.ReadPassword(os.Stdin.Fd())
-		fmt.Printf("\r\n")
+		if !gopt {
+			fmt.Printf("\r\n")
+		}
 		if e != nil {
 			panic(e)
 		}