diff --git a/hub/onboard-spoke.sh b/hub/onboard-spoke.sh
index 347234a..26a905b 100644
--- a/hub/onboard-spoke.sh
+++ b/hub/onboard-spoke.sh
@@ -93,5 +93,5 @@ echo -e "  Hub key:     ${GREEN}$KEY_PATH${NC}"
 echo -e "  rclone:      ${GREEN}${SPOKE_NAME}-remote${NC}"
 echo ""
 echo -e "${YELLOW}To mount this spoke:${NC}"
-echo "  hubspoke-helper.sh hub start"
+echo "  RCLONE_REMOTE=${SPOKE_NAME}-remote hubspoke-helper.sh hub start"
 echo ""
diff --git a/setup.sh b/setup.sh
index b17b969..16fbe1f 100644
--- a/setup.sh
+++ b/setup.sh
@@ -88,8 +88,8 @@ case "$KEY_CHOICE" in
     chmod 700 "$SSH_DIR"
 
     echo "Paste the private key content below, then press ENTER and CTRL+D:"
-    KEY_CONTENT=$(cat)
-    echo "$KEY_CONTENT" > "$KEY_PATH"
+    KEY_CONTENT=$(cat | tr -d '\r')
+    printf '%s\n' "$KEY_CONTENT" > "$KEY_PATH"
     chown armbian:armbian "$KEY_PATH"
     chmod 600 "$KEY_PATH"
     info "Key saved to $KEY_PATH"