diff --git a/frontend/public/json/kasm.json b/frontend/public/json/kasm.json
index 73511efb0..e4f27383f 100644
--- a/frontend/public/json/kasm.json
+++ b/frontend/public/json/kasm.json
@@ -41,7 +41,7 @@
       "type": "warning"
     },
     {
-      "text": "Show password: `cat ~/kasm.creds`",
+      "text": "Show credentials: `cat ~/kasm.creds`",
       "type": "info"
     }
   ]
diff --git a/install/kasm-install.sh b/install/kasm-install.sh
index 9dda36c72..1b0cc22b9 100644
--- a/install/kasm-install.sh
+++ b/install/kasm-install.sh
@@ -16,22 +16,22 @@ update_os
 msg_info "Installing Kasm Workspaces"
 KASM_VERSION=$(curl -fsSL 'https://www.kasmweb.com/downloads' | grep -o 'https://kasm-static-content.s3.amazonaws.com/kasm_release_[^"]*\.tar\.gz' | head -n 1 | sed -E 's/.*release_(.*)\.tar\.gz/\1/')
 curl -fsSL -o "/opt/kasm_release_${KASM_VERSION}.tar.gz" "https://kasm-static-content.s3.amazonaws.com/kasm_release_${KASM_VERSION}.tar.gz"
-
 cd /opt
 tar -xf "kasm_release_${KASM_VERSION}.tar.gz"
 chmod +x /opt/kasm_release/install.sh
 printf 'y\ny\ny\n4\n' | bash /opt/kasm_release/install.sh > ~/kasm-install.output 2>&1
-cat ~/kasm-install.output | grep -A 20 -i "credentials\|login\|password\|admin" | sed '1i Kasm-Workspaces-Credentials' >~/kasm.creds
-
+awk '
+  /^Kasm UI Login Credentials$/ {capture=1}
+  capture {print}
+  /^Service Registration Token$/ {in_token=1}
+  in_token && /^-+$/ {dash_count++}
+  in_token && dash_count==2 {exit}
+' ~/kasm-install.output > ~/kasm.creds
 msg_ok "Installed Kasm Workspaces"
 
 motd_ssh
 customize
 
-msg_info "Displaying Kasm Credentials"
-cat ~/kasm.creds
-msg_ok "Kasm Credentials displayed"
-
 msg_info "Cleaning up"
 rm -f /opt/kasm_release_${KASM_VERSION}.tar.gz
 rm -f ~/kasm-install.output